| 1 |
commit: aca04a15a282ceed47c01eceed3e115594fd14fb |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 20 23:37:33 2020 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 20 14:46:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca04a15 |
| 7 |
|
| 8 |
sys-apps/baselayout: fix quoting and add a missing die call |
| 9 |
|
| 10 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/baselayout/baselayout-2.7.ebuild | 5 +++-- |
| 13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild |
| 16 |
index 104cf105212..ee4f298e840 100644 |
| 17 |
--- a/sys-apps/baselayout/baselayout-2.7.ebuild |
| 18 |
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild |
| 19 |
@@ -33,7 +33,7 @@ multilib_layout() { |
| 20 |
|
| 21 |
if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then |
| 22 |
prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) |
| 23 |
- for prefix in ${prefix_lst[@]}; do |
| 24 |
+ for prefix in "${prefix_lst[@]}"; do |
| 25 |
for libdir in ${libdirs}; do |
| 26 |
dir="${prefix}${libdir}" |
| 27 |
if [[ -e "${dir}" ]]; then |
| 28 |
@@ -153,7 +153,8 @@ multilib_layout() { |
| 29 |
if ! use split-usr ; then |
| 30 |
for libdir in ${libdirs}; do |
| 31 |
if [[ ! -e "${EROOT}${libdir}" ]]; then |
| 32 |
- ln -s usr/"${libdir}" "${EROOT}${libdir}" |
| 33 |
+ ln -s usr/"${libdir}" "${EROOT}${libdir}" || |
| 34 |
+ die " Unable to make ${EROOT}${libdir} symlink" |
| 35 |
fi |
| 36 |
done |
| 37 |
fi |
Archives