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

commit:     1ffd1b26731d512c0554282394d7f3e58d1fa6f7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:39 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:11:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffd1b26

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

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

 app-text/openjade/openjade-1.3.2-r9.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 2d63798c3d7..9aa17662d63 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -124,8 +124,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ ! -f ${EROOT}/etc/sgml/${P}.cat ]]; then
-		cp "${T}"/${P}.cat "${EROOT}"/etc/sgml/ || die
+	local backup=${T}/${P}.cat
+	local real=${EROOT}/etc/sgml/${P}.cat
+	if ! cmp -s "${backup}" "${real}"; then
+		cp "${backup}" "${real}" || die
 	fi
 	# this one's shared with docbook-dsssl, so we need to do it in postinst
 	if ! grep -q -s ${P}.cat \


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

Thread overview: 41+ 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 --
2024-08-10  6:58 [gentoo-commits] repo/gentoo:master commit in: app-text/openjade/ Joonas Niilola
2023-07-25 21:00 Conrad Kostecki
2022-05-14  7:28 WANG Xuerui
2019-12-22  8:28 Michał Górny
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 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 13:43 Mikle Kolyada
2019-02-16  9:28 Pacho Ramos
2019-02-12 12:01 Mikle Kolyada
2019-02-12 12:01 Mikle Kolyada
2019-02-12 12:01 Mikle Kolyada
2019-02-12 12:01 Mikle Kolyada
2019-02-09 18:36 Thomas Deutschmann
2019-02-07 13:30 Mart Raudsepp
2019-02-07 12:09 Mikle Kolyada
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 19:18 Sergei Trofimovich
2019-02-02 19:09 Sergei Trofimovich
2019-02-01 10:40 Tobias Klausmann
2019-01-28 19:38 Sergei Trofimovich
2018-06-04 13:06 Mike Frysinger
2018-04-14 18:58 Pacho Ramos
2018-03-28 20:53 Mart Raudsepp
2018-03-19 22:42 Sergei Trofimovich
2017-07-26 19:49 Markus Meier
2017-06-10 13:45 Agostino Sarubbo
2017-06-05 11:05 Agostino Sarubbo
2017-01-12 19:57 Fabian Groffen
2016-11-27  8:38 David Seifert
2016-09-14 22:28 David Seifert

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=1568704316.1ffd1b26731d512c0554282394d7f3e58d1fa6f7.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