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@gentoo.org>
This commit is contained in:
Sam James
2021-10-07 03:47:02 +01:00
parent 04aeea5c0f
commit 26a4a7456a
5 changed files with 30 additions and 10 deletions

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}