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 5CE79138334 for ; Tue, 17 Sep 2019 07:12:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60D9BE0AB1; Tue, 17 Sep 2019 07:12:07 +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 3F921E0AB1 for ; Tue, 17 Sep 2019 07:12:07 +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 1A33134B28E for ; Tue, 17 Sep 2019 07:12:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D05BD7FA 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: <1568704317.2da95873dbe9c2023711aea244def786e8c9fe6f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sgmltools-lite/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild X-VCS-Directories: app-text/sgmltools-lite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2da95873dbe9c2023711aea244def786e8c9fe6f 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: 38291d51-ec35-431f-8f75-27869162bdb3 X-Archives-Hash: 1f038f2cc069d755dbb76ed60f1fbeef commit: 2da95873dbe9c2023711aea244def786e8c9fe6f Author: Michał Górny gentoo org> AuthorDate: Tue Sep 17 07:07:42 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 17 07:11:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da95873 app-text/sgmltools-lite: Restore .cat backup for non-empty too Signed-off-by: Michał Górny gentoo.org> app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild index b8d8da45abc..b23d92b022e 100644 --- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild +++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild @@ -92,8 +92,10 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! -f ${EROOT}/etc/sgml/sgml-lite.cat ]]; then - cp "${T}"/sgml-lite.cat "${EROOT}"/etc/sgml/ || die + local backup=${T}/sgml-lite.cat + local real=${EROOT}/etc/sgml/sgml-lite.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die fi sgml-catalog-r1_pkg_postinst }