Merged from trunk 7877:7879

   | 7878      | Fix quoting as reported by Drac in bug 194169              |
   | WarnerBro |                                                            |

   | 7879      | revert useless quoting                                     |
   | SpankMan  |                                                            |

svn path=/main/branches/prefix/; revision=7884

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1a234301d0632bd08663e3de6ec22a5fce1e47e3..ee70c20b77f3c9309e34466653e7c8d61d754595 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1495,9 +1495,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 c1636b2153653fa587a1ace091c1dc06286f3ff8..30296761888562c93a89019a79bbfd37b2b23012 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -132,7 +132,7 @@ elog_base() {
                        return 1
                        ;;
        esac
-       echo -e "$*" >> ${T}/logging/${EBUILD_PHASE:-other}.${messagetype}
+       echo -e "$*" >> "${T}/logging/${EBUILD_PHASE:-other}.${messagetype}"
        return 0
 }