From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Nov 2007 05:42:10 +0000 (-0000)
Subject: Fix quoting to work properly with eval.
X-Git-Tag: v2.2_pre1~331
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc35b3d263cff436e1fbded1cc840eb3b44a9073;p=portage.git

Fix quoting to work properly with eval.

svn path=/main/trunk/; revision=8640
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ab663d028..d5b770dd8 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1623,14 +1623,14 @@ elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then
 	fi
 	# Colon separated SANDBOX_* variables need to be cumulative.
 	for x in SANDBOX_DENY SANDBOX_READ SANDBOX_PREDICT SANDBOX_WRITE ; do
-		eval PORTAGE_${x}="${!x}"
+		eval PORTAGE_${x}=\${!x}
 	done
 	source "${T}"/environment
 	for x in SANDBOX_DENY SANDBOX_PREDICT SANDBOX_READ SANDBOX_WRITE ; do
 		eval y=\${PORTAGE_${x}}
 		if [ "${y}" != "${!x}" ] ; then
-			eval export ${x}=$(echo -n "${y}:${!x}" | tr ":" "\0" | \
-				sort -z -u | tr "\0" ":")
+			eval export ${x}=\"$(echo -n "${y}:${!x}" | tr ":" "\0" | \
+				sort -z -u | tr "\0" ":")\"
 		fi
 		unset PORTAGE_${x}
 	done