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 44D5D138334 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 CA85DE091F; 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 A60DFE091F 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 64DEE34B2A1 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 5AB837F4 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: <1568704312.c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild X-VCS-Directories: app-text/docbook-xml-dtd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21 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: 7a725350-92cf-4c35-80c5-792f73264486 X-Archives-Hash: 0d204e57329d77993ea479962997f624 commit: c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 17 07:07:33 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 17 07:11:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2dcf16a app-text/docbook-xml-dtd: Restore .cat backup for non-empty too Signed-off-by: Michał Górny gentoo.org> app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 6 ++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 6 ++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 6 ++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 6 ++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild index fdf2ac2ad67..9d06ca5a515 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild @@ -49,8 +49,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild index db788fca68f..2864178f068 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild @@ -49,8 +49,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild index db788fca68f..2864178f068 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild @@ -49,8 +49,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild index d0987c01141..fb841c4266b 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild @@ -50,8 +50,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild index d0987c01141..fb841c4266b 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild @@ -50,8 +50,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/xml-docbook-${PV}.cat + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi build-docbook-catalog sgml-catalog-r1_pkg_postinst