1 |
commit: 28ec90ba6326a46a7b9bd10c6ce9afec37457157 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 20 15:15:43 2020 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 20 15:27:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ec90ba |
7 |
|
8 |
sys-apps/baselayout: add missing dies |
9 |
|
10 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
13 |
|
14 |
sys-apps/baselayout/baselayout-2.7.ebuild | 24 +++++++++++++----------- |
15 |
1 file changed, 13 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild |
18 |
index ee4f298e840..25ccf0871bf 100644 |
19 |
--- a/sys-apps/baselayout/baselayout-2.7.ebuild |
20 |
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild |
21 |
@@ -101,7 +101,7 @@ multilib_layout() { |
22 |
elif [ -d "${prefix}lib" ] ; then |
23 |
# "lib" is a dir, so need to convert to a symlink |
24 |
ewarn "Converting ${prefix}lib from a dir to a symlink" |
25 |
- rm -f "${prefix}lib"/.keep |
26 |
+ rm -f "${prefix}lib"/.keep || die |
27 |
if rmdir "${prefix}lib" 2>/dev/null ; then |
28 |
ln -s ${def_libdir} "${prefix}lib" || die |
29 |
else |
30 |
@@ -113,7 +113,7 @@ multilib_layout() { |
31 |
mkdir -p "${prefix}" || die |
32 |
rm -f "${prefix}lib" || die |
33 |
ln -s ${def_libdir} "${prefix}lib" || die |
34 |
- mkdir -p "${prefix}${def_libdir}" #423571 |
35 |
+ mkdir -p "${prefix}${def_libdir}" || die #423571 |
36 |
fi |
37 |
else |
38 |
# we need to make sure "lib" is a dir |
39 |
@@ -135,7 +135,7 @@ multilib_layout() { |
40 |
*-gentoo-freebsd*) ;; # We want it the other way on fbsd. |
41 |
i?86*|x86_64*|powerpc*|sparc*|s390*) |
42 |
if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then |
43 |
- rm -f "${prefix}lib32"/.keep |
44 |
+ rm -f "${prefix}lib32"/.keep || die |
45 |
if ! rmdir "${prefix}lib32" 2>/dev/null ; then |
46 |
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" |
47 |
die "non-empty dir found where there should be none: ${prefix}lib32" |
48 |
@@ -164,7 +164,7 @@ pkg_preinst() { |
49 |
# This is written in src_install (so it's in CONTENTS), but punt all |
50 |
# pending updates to avoid user having to do etc-update (and make the |
51 |
# pkg_postinst logic simpler). |
52 |
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release |
53 |
+ rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die |
54 |
|
55 |
# We need to install directories and maybe some dev nodes when building |
56 |
# stages, but they cannot be in CONTENTS. |
57 |
@@ -177,7 +177,7 @@ pkg_preinst() { |
58 |
emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge |
59 |
fi |
60 |
fi |
61 |
- rm -f "${ED}"/usr/share/${PN}/Makefile |
62 |
+ rm -f "${ED}"/usr/share/${PN}/Makefile || die |
63 |
} |
64 |
|
65 |
src_prepare() { |
66 |
@@ -223,7 +223,7 @@ src_install() { |
67 |
DESTDIR="${ED}" \ |
68 |
install |
69 |
dodoc ChangeLog |
70 |
- rm "${ED}"/etc/sysctl.d/README |
71 |
+ rm "${ED}"/etc/sysctl.d/README || die |
72 |
|
73 |
# need the makefile in pkg_preinst |
74 |
insinto /usr/share/${PN} |
75 |
@@ -241,17 +241,19 @@ pkg_postinst() { |
76 |
for x in master.passwd passwd shadow group fstab ; do |
77 |
[ -e "${EROOT}etc/${x}" ] && continue |
78 |
[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue |
79 |
- cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc |
80 |
+ cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die |
81 |
done |
82 |
|
83 |
# Force shadow permissions to not be world-readable #260993 |
84 |
for x in shadow ; do |
85 |
- [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" |
86 |
+ if [ -e "${EROOT}etc/${x}" ] ; then |
87 |
+ chmod o-rwx "${EROOT}etc/${x}" || die |
88 |
+ fi |
89 |
done |
90 |
|
91 |
# Take care of the etc-update for the user |
92 |
if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then |
93 |
- mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release |
94 |
+ mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die |
95 |
fi |
96 |
|
97 |
# whine about users that lack passwords #193541 |
98 |
@@ -276,7 +278,7 @@ pkg_postinst() { |
99 |
|
100 |
# https://bugs.gentoo.org/361349 |
101 |
if use kernel_linux; then |
102 |
- mkdir -p "${EROOT}"run |
103 |
+ mkdir -p "${EROOT}"run || die |
104 |
|
105 |
local found fstype mountpoint |
106 |
while read -r _ mountpoint fstype _; do |
107 |
@@ -299,7 +301,7 @@ pkg_postinst() { |
108 |
# clean up after 2.5 typos |
109 |
# https://bugs.gentoo.org/show_bug.cgi?id=656380 |
110 |
if [[ ${x} == 2.5 ]]; then |
111 |
- rm -fr "${EROOT}{,usr" |
112 |
+ rm -fr "${EROOT}{,usr" || die |
113 |
fi |
114 |
done |