diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-10-05 01:41:08 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-10-05 01:41:08 +0000 |
commit | b212fccaff836699d1177e1295a401f6e7c7c071 (patch) | |
tree | f19ca3f1912c0308f1045f8852ede473625c77ac | |
parent | f845c6114a46bc02a0415609881cb213c74c8556 (diff) | |
download | portage-b212fccaff836699d1177e1295a401f6e7c7c071.tar.gz portage-b212fccaff836699d1177e1295a401f6e7c7c071.tar.bz2 portage-b212fccaff836699d1177e1295a401f6e7c7c071.zip |
Fix quoting as reported by Drac in bug 194169 (trunk r7877:7879)
svn path=/main/branches/2.1.2/; revision=7921
-rwxr-xr-x | bin/ebuild.sh | 4 | ||||
-rw-r--r-- | bin/isolated-functions.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 79bfaf062..f9829fee4 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1589,9 +1589,7 @@ then fi #a reasonable default for $S -if [ "$S" = "" ]; then - export S=${WORKDIR}/${P} -fi +[[ -z ${S} ]] && export S=${WORKDIR}/${P} #wipe the interceptors. we don't want saved. if hasq "depend" "${EBUILD_SH_ARGS}"; then diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 01fbbf272..bb119b98e 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -24,7 +24,7 @@ elog_base() { return 1 ;; esac - echo -e "$*" >> ${T}/logging/${EBUILD_PHASE:-other}.${messagetype} + echo -e "$*" >> "${T}/logging/${EBUILD_PHASE:-other}.${messagetype}" return 0 } |