From 981cea176b91df51587e898cbb552574d6d9d4d8 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 29 Sep 2007 20:31:29 +0000
Subject: [PATCH]    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
---
 bin/ebuild.sh             | 4 +---
 bin/isolated-functions.sh | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1a234301d..ee70c20b7 100755
--- 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 c1636b215..302967618 100755
--- 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
 }
 
-- 
2.26.2