From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 9 Mar 2006 21:39:11 +0000 (-0000)
Subject: Remove "myarg" from the ebuild.sh env before it is saved so that it doesn't interfere... 
X-Git-Tag: v2.1_pre6~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75d123cbf41296297ba690ecc08cb8b169b9e5e6;p=portage.git

Remove "myarg" from the ebuild.sh env before it is saved so that it doesn't interfere when ebuild.sh is sourced by other scripts.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3e96503c2..b6b7fa533 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1938,6 +1938,9 @@ done
 
 # Save the env only for relevant phases.
 if [ -n "$myarg" ] && [ "$myarg" != "clean" ]; then
+	# Do not save myarg in the env, or else the above [ -n "$myarg" ] test will
+	# give a false positive when ebuild.sh is sourced.
+	unset myarg
 	# Save current environment and touch a success file. (echo for success)
 	umask 002
 	set | egrep -v "^SANDBOX_" > "${T}/environment" 2>/dev/null