[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/
Date: Tue, 17 Sep 2019 07:12:02 +0000 (UTC)	[thread overview]
Message-ID: <1568704312.c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21.mgorny@gentoo> (raw)

commit:     c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:33 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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

next             reply	other threads:[~2019-09-17  7:12 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-17  7:12 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-09  5:29 [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/ WANG Xuerui
2022-04-29  7:59 WANG Xuerui
2022-04-29  7:59 WANG Xuerui
2021-10-07  2:48 Sam James
2020-12-27 14:01 Fabian Groffen
2019-11-08 21:13 Michał Górny
2019-11-08 21:13 Michał Górny
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 12:42 Aaron Bauman
2019-10-14 11:31 Agostino Sarubbo
2019-10-14 11:25 Agostino Sarubbo
2019-10-14 11:07 Agostino Sarubbo
2019-10-12  8:55 Mikle Kolyada
2019-10-12  8:55 Mikle Kolyada
2019-10-12  8:55 Mikle Kolyada
2019-09-11 17:58 Michał Górny
2019-09-11 17:58 Michał Górny
2019-05-05 10:16 Mikle Kolyada
2019-05-04 14:43 Andreas K. Hüttel
2019-03-27 19:28 Fabian Groffen

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fdf2ac2ad6 dfblob:9d06ca5a51 dfblob:db788fca68
dfblob:2864178f06 dfblob:db788fca68 dfblob:2864178f06 dfblob:d0987c0114
dfblob:fb841c4266 dfblob:d0987c0114 dfblob:fb841c4266 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1568704312.c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox