From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04289138335 for ; Tue, 17 Sep 2019 07:12:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA1F1E0997; Tue, 17 Sep 2019 07:12:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85B53E091F for ; Tue, 17 Sep 2019 07:12:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 212DD34B28D for ; Tue, 17 Sep 2019 07:12:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E1447F5 for ; Tue, 17 Sep 2019 07:12:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1568704313.3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild X-VCS-Directories: app-text/docbook-xml-simple-dtd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9 X-VCS-Branch: master Date: Tue, 17 Sep 2019 07:12:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0bc641cc-687f-4edd-aa7e-4a6bbf1c518c X-Archives-Hash: 5df9276fc04af39a28d0b672496b6a37 commit: 3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 17 07:07:34 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 17 07:11:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3009bf38 app-text/docbook-xml-simple-dtd: Restore .cat backup for non-empty too Signed-off-by: Michał Górny gentoo.org> .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild | 6 ++++-- .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 6 ++++-- .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild index ca6929bbed3..19a3541028b 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild @@ -36,8 +36,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-simple-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi build-docbook-catalog sgml-catalog-r1_pkg_postinst diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild index d4e1735315d..bd0a32a10e5 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild @@ -39,8 +39,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-simple-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi build-docbook-catalog sgml-catalog-r1_pkg_postinst diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild index b818a587508..e68783e3d12 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild @@ -36,8 +36,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-simple-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi build-docbook-catalog sgml-catalog-r1_pkg_postinst