From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/
Date: Thu, 7 Oct 2021 02:48:23 +0000 (UTC) [thread overview]
Message-ID: <1633574822.26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.sam@gentoo> (raw)
commit: 26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 7 02:47:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
}
next reply other threads:[~2021-10-07 2:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 2:48 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 5:29 [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-dtd/ WANG Xuerui
2022-04-29 7:59 WANG Xuerui
2022-04-29 7:59 WANG Xuerui
2020-12-27 14:01 Fabian Groffen
2019-11-08 21:13 Michał Górny
2019-11-08 21:13 Michał Górny
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 12:42 Aaron Bauman
2019-10-14 11:31 Agostino Sarubbo
2019-10-14 11:25 Agostino Sarubbo
2019-10-14 11:07 Agostino Sarubbo
2019-10-12 8:55 Mikle Kolyada
2019-10-12 8:55 Mikle Kolyada
2019-10-12 8:55 Mikle Kolyada
2019-09-17 7:12 Michał Górny
2019-09-11 17:58 Michał Górny
2019-09-11 17:58 Michał Górny
2019-05-05 10:16 Mikle Kolyada
2019-05-04 14:43 Andreas K. Hüttel
2019-03-27 19:28 Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1633574822.26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox