From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/
Date: Thu, 7 Oct 2021 02:48:23 +0000 (UTC) [thread overview]
Message-ID: <1633574831.98669e96960101455f34cb8f7c710cdb0b84e73c.sam@gentoo> (raw)
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
}
next reply other threads:[~2021-10-07 2:48 UTC|newest]
Thread overview: 39+ 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-08-27 10:11 [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/ WANG Xuerui
2022-08-27 10:11 WANG Xuerui
2022-08-27 10:11 WANG Xuerui
2021-07-26 8:07 Yixun Lan
2019-11-08 21:13 Michał Górny
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 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-02-16 9:28 Pacho Ramos
2019-02-12 11:48 Mikle Kolyada
2019-02-12 11:48 Mikle Kolyada
2019-02-12 11:48 Mikle Kolyada
2019-02-12 11:48 Mikle Kolyada
2019-02-07 13:30 Mart Raudsepp
2019-02-07 10:44 Mikle Kolyada
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 19:18 Sergei Trofimovich
2019-02-02 19:18 Sergei Trofimovich
2019-02-02 19:09 Sergei Trofimovich
2019-02-02 19:09 Sergei Trofimovich
2019-02-02 10:11 Sergei Trofimovich
2019-02-02 10:11 Sergei Trofimovich
2019-02-01 10:40 Tobias Klausmann
2019-01-31 21:34 Tobias Klausmann
2018-03-08 18:42 Michał Górny
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=1633574831.98669e96960101455f34cb8f7c710cdb0b84e73c.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