| 1 |
commit: 299042fc29cbb1cb9dbbcea2c5518761fd3819cb |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 17 07:07:31 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 17 07:11:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299042fc |
| 7 |
|
| 8 |
app-text/docbook-sgml-dtd: Restore .cat backup for non-empty too |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild | 6 ++++-- |
| 13 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild | 6 ++++-- |
| 14 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild | 6 ++++-- |
| 15 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild | 6 ++++-- |
| 16 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild | 6 ++++-- |
| 17 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild | 6 ++++-- |
| 18 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild | 6 ++++-- |
| 19 |
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild | 6 ++++-- |
| 20 |
8 files changed, 32 insertions(+), 16 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild |
| 23 |
index d72a8256809..1787a5d05c8 100644 |
| 24 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild |
| 25 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild |
| 26 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 27 |
} |
| 28 |
|
| 29 |
pkg_postinst() { |
| 30 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 31 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 32 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 33 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 34 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 35 |
+ cp "${backup}" "${real}" || die |
| 36 |
fi |
| 37 |
sgml-catalog-r1_pkg_postinst |
| 38 |
} |
| 39 |
|
| 40 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild |
| 41 |
index d72a8256809..1787a5d05c8 100644 |
| 42 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild |
| 43 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild |
| 44 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 45 |
} |
| 46 |
|
| 47 |
pkg_postinst() { |
| 48 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 49 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 50 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 51 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 52 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 53 |
+ cp "${backup}" "${real}" || die |
| 54 |
fi |
| 55 |
sgml-catalog-r1_pkg_postinst |
| 56 |
} |
| 57 |
|
| 58 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild |
| 59 |
index d72a8256809..1787a5d05c8 100644 |
| 60 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild |
| 61 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild |
| 62 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 63 |
} |
| 64 |
|
| 65 |
pkg_postinst() { |
| 66 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 67 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 68 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 69 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 70 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 71 |
+ cp "${backup}" "${real}" || die |
| 72 |
fi |
| 73 |
sgml-catalog-r1_pkg_postinst |
| 74 |
} |
| 75 |
|
| 76 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild |
| 77 |
index d72a8256809..1787a5d05c8 100644 |
| 78 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild |
| 79 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild |
| 80 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 81 |
} |
| 82 |
|
| 83 |
pkg_postinst() { |
| 84 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 85 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 86 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 87 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 88 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 89 |
+ cp "${backup}" "${real}" || die |
| 90 |
fi |
| 91 |
sgml-catalog-r1_pkg_postinst |
| 92 |
} |
| 93 |
|
| 94 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild |
| 95 |
index 868d3429aec..118ee206846 100644 |
| 96 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild |
| 97 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild |
| 98 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 99 |
} |
| 100 |
|
| 101 |
pkg_postinst() { |
| 102 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 103 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 104 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 105 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 106 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 107 |
+ cp "${backup}" "${real}" || die |
| 108 |
fi |
| 109 |
sgml-catalog-r1_pkg_postinst |
| 110 |
} |
| 111 |
|
| 112 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild |
| 113 |
index 65e94280b8f..bef0181183d 100644 |
| 114 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild |
| 115 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild |
| 116 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 117 |
} |
| 118 |
|
| 119 |
pkg_postinst() { |
| 120 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 121 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 122 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 123 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 124 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 125 |
+ cp "${backup}" "${real}" || die |
| 126 |
fi |
| 127 |
sgml-catalog-r1_pkg_postinst |
| 128 |
} |
| 129 |
|
| 130 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild |
| 131 |
index 8e65feba19d..fd2c41e6679 100644 |
| 132 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild |
| 133 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild |
| 134 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 135 |
} |
| 136 |
|
| 137 |
pkg_postinst() { |
| 138 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 139 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 140 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 141 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 142 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 143 |
+ cp "${backup}" "${real}" || die |
| 144 |
fi |
| 145 |
sgml-catalog-r1_pkg_postinst |
| 146 |
} |
| 147 |
|
| 148 |
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild |
| 149 |
index f72a63fe757..9e8d322d952 100644 |
| 150 |
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild |
| 151 |
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild |
| 152 |
@@ -37,8 +37,10 @@ pkg_preinst() { |
| 153 |
} |
| 154 |
|
| 155 |
pkg_postinst() { |
| 156 |
- if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then |
| 157 |
- cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die |
| 158 |
+ local backup=${T}/sgml-docbook-${PV}.cat |
| 159 |
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat |
| 160 |
+ if ! cmp -s "${backup}" "${real}"; then |
| 161 |
+ cp "${backup}" "${real}" || die |
| 162 |
fi |
| 163 |
sgml-catalog-r1_pkg_postinst |
| 164 |
} |
Archives