diff options
| author |   Sam James <sam@gentoo.org> | 2021-10-07 03:47:02 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-10-07 03:47:02 +0100 |
| commit | 26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b (patch) | |
| tree | e811d6e40a857b92067ae564a3c6f1d743e26a5e /app-text | |
| parent | app-text/build-docbook-catalog: die on failed build-docbook-catalog (diff) | |
| download | gentoo-26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.tar.gz gentoo-26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.tar.bz2 gentoo-26a4a7456ad6509d42ef1c3f92aee8eea3f7a04b.zip | |
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>
Diffstat (limited to 'app-text')
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 f049bf68fffd..e3188ba498f9 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 ee06649a6b4a..ee19a3db01c8 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 ee06649a6b4a..ee19a3db01c8 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 175a7581c5ed..b9ce7d99daff 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 175a7581c5ed..b9ce7d99daff 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 } |