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 0B102158086 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 405D5E087B; 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 16F5FE087A 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 371B8343382 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 AE9EF129 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: <1633574822.26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild X-VCS-Directories: app-text/docbook-xml-dtd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b 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: 44c3f746-84a2-4a1f-8bc0-a1cdbc995aaa X-Archives-Hash: f4dc51920f102d6f1da87e72c4493784 commit: 26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b Author: Sam James gentoo org> AuthorDate: Thu Oct 7 02:47:02 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 7 02:47:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a4a745 app-text/docbook-xml-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> app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 8 ++++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 8 ++++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 8 ++++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 8 ++++++-- app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 8 ++++++-- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild index f049bf68fff..e3188ba498f 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild index ee06649a6b4..ee19a3db01c 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild index ee06649a6b4..ee19a3db01c 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild index 175a7581c5e..b9ce7d99daf 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild @@ -52,14 +52,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-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-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild index 175a7581c5e..b9ce7d99daf 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild @@ -52,14 +52,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-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 }