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 A0A64158086 for ; Thu, 7 Oct 2021 02:48:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ADEBE087A; Thu, 7 Oct 2021 02:48:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E336E087A for ; Thu, 7 Oct 2021 02:48:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FFEE343384 for ; Thu, 7 Oct 2021 02:48:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C31C713F for ; Thu, 7 Oct 2021 02:48:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633574831.98669e96960101455f34cb8f7c710cdb0b84e73c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild X-VCS-Directories: app-text/docbook-xml-simple-dtd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 98669e96960101455f34cb8f7c710cdb0b84e73c X-VCS-Branch: master Date: Thu, 7 Oct 2021 02:48:23 +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: 10d63323-e31f-4be0-86a4-b817c19e1b91 X-Archives-Hash: 4a485730d306fa68e9e222a03c9294d7 commit: 98669e96960101455f34cb8f7c710cdb0b84e73c Author: Sam James gentoo org> AuthorDate: Thu Oct 7 02:47:11 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 7 02:47:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98669e96 app-text/docbook-xml-simple-dtd: die on failed build-docbook-catalog Fail loudly if build-docbook-catalog wasn't successful; this is likely due to /run not being (bind-)mounted (in chroots/new installs). Bug: https://bugs.gentoo.org/816303 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Sam James gentoo.org> .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild | 8 ++++++-- .../docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 8 ++++++-- .../docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild index 2f7d18739a2..4650a13e7f0 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild @@ -38,14 +38,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild index 8e164c62c15..ebc3aba11d4 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild @@ -41,14 +41,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild index 64ebd01a124..5e77faad079 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild @@ -38,14 +38,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm }