Fix quoting as reported by Drac in bug 194169 (trunk r7877:7879)

svn path=/main/branches/2.1.2/; revision=7921

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 79bfaf062bb6d422732c9277692578cd7025431c..f9829fee482843f33a7d78ab503ad03b371060ca 100755 (executable)
--- 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 01fbbf2722d5b8db0bc61fc10727ca641d0e786f..bb119b98ec43508e0fb8499e8cd2edb92de040fe 100644 (file)
--- 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
 }