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/xhtml1/
Date: Tue, 17 Sep 2019 07:12:02 +0000 (UTC)	[thread overview]
Message-ID: <1568704318.27da295ed52b004a9f42fa4fdc06db9bcfde2667.mgorny@gentoo> (raw)

commit:     27da295ed52b004a9f42fa4fdc06db9bcfde2667
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:44 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:11:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27da295e

app-text/xhtml1: Restore .cat backup for non-empty too

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-text/xhtml1/xhtml1-20020801-r6.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 306fefc150c..f8356d929bb 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -46,8 +46,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ ! -f ${EROOT}/etc/sgml/xhtml1.cat ]]; then
-		cp "${T}"/xhtml1.cat "${EROOT}"/etc/sgml/ || die
+	local backup=${T}/xhtml1.cat
+	local real=${EROOT}/etc/sgml/xhtml1.cat
+	if ! cmp -s "${backup}" "${real}"; then
+		cp "${backup}" "${real}" || die
 	fi
 	sgml-catalog-r1_pkg_postinst
 


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

Thread overview: 28+ 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 --
2025-03-06 20:18 [gentoo-commits] repo/gentoo:master commit in: app-text/xhtml1/ Mike Gilbert
2024-08-26 16:29 Arthur Zamarin
2022-08-27 10:11 WANG Xuerui
2022-08-24  5:18 Sam James
2022-07-30  9:51 Arthur Zamarin
2022-07-26  4:46 Sam James
2022-07-26  2:05 Sam James
2022-07-26  1:36 Sam James
2022-06-09  2:43 Sam James
2022-05-16  2:29 Sam James
2022-05-15  3:48 Sam James
2022-05-14  9:21 Jakov Smolić
2022-05-14  9:18 Jakov Smolić
2022-05-14  8:10 Arthur Zamarin
2020-08-20 13:20 Sam James
2019-12-28 21:32 Georgy Yakovlev
2019-11-08 21:13 Michał Górny
2019-11-08 21:13 Michał Górny
2019-10-14 11:07 Agostino Sarubbo
2019-10-12  8:55 Mikle Kolyada
2019-09-11 17:58 Michał Górny
2019-09-11 17:58 Michał Górny
2019-08-15  9:42 Michał Górny
2018-01-22 19:13 Mikle Kolyada
2018-01-22 19:12 Mikle Kolyada
2018-01-11 21:58 Andreas Hüttel
2016-02-28  7:25 Matt Thode

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=1568704318.27da295ed52b004a9f42fa4fdc06db9bcfde2667.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