[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/

[Sam James]

commit:     98669e96960101455f34cb8f7c710cdb0b84e73c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 02:47:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
 }