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 7D79F138334 for ; Tue, 17 Sep 2019 07:12:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1A85E0950; 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 87527E0950 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 3447034B28E 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 33C6E7F1 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: <1568704310.8e9b6ca0d9aea5c56f5ae89a741f87c281b30377.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-dsssl-stylesheets/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild X-VCS-Directories: app-text/docbook-dsssl-stylesheets/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8e9b6ca0d9aea5c56f5ae89a741f87c281b30377 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: 59a7407f-c2b0-4a3c-8fec-e381eb13dbc0 X-Archives-Hash: 88741654985ea1c9a2534e68194db847 commit: 8e9b6ca0d9aea5c56f5ae89a741f87c281b30377 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 17 07:07:30 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 17 07:11:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9b6ca0 app-text/docbook-dsssl-stylesheets: Restore .cat backup for non-empty too Signed-off-by: Michał Górny gentoo.org> .../docbook-dsssl-stylesheets-1.79-r4.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild index 8603dfc7f36..7137b03bc61 100644 --- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild +++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild @@ -64,8 +64,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat ]]; then - cp "${T}"/dsssl-docbook-stylesheets.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/dsssl-docbook-stylesheets.cat + local real=${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi # this one's shared with openjade, so we need to do it in postinst if ! grep -q -s dsssl-docbook-stylesheets.cat \