From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 2 Sep 2010 20:15:10 +0000 (-0700)
Subject: Prevent local x variable in ebuild_main() from showing up in
X-Git-Tag: v2.2_rc74~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcf9d2ff4f7bfa47cba7df48e3cc49f3e817d7ce;p=portage.git

Prevent local x variable in ebuild_main() from showing up in
environment.bz2.
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 5177494f9..f17e63b3e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2104,8 +2104,6 @@ ebuild_main() {
 	export EBUILD_MASTER_PID=$BASHPID
 	trap 'exit 1' SIGTERM
 
-	local f x
-
 	if [[ $EBUILD_PHASE != depend ]] ; then
 		# Force configure scripts that automatically detect ccache to
 		# respect FEATURES="-ccache".
@@ -2155,10 +2153,12 @@ ebuild_main() {
 		case "$EBUILD_SH_ARGS" in
 		configure|compile)
 
+			local x
 			for x in ASFLAGS CCACHE_DIR CCACHE_SIZE \
 				CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS ; do
 				[[ ${!x+set} = set ]] && export $x
 			done
+			unset x
 
 			hasq distcc $FEATURES && [[ -n $DISTCC_DIR ]] && \
 				[[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \