summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-09 21:39:11 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-09 21:39:11 +0000
commit75d123cbf41296297ba690ecc08cb8b169b9e5e6 (patch)
tree1cc3c3bee9a5bb69f7b52dc1ac6fddcb0f7613cb
parent105f641d2470549ac40d5739b23ab9371b608597 (diff)
downloadportage-75d123cbf41296297ba690ecc08cb8b169b9e5e6.tar.gz
portage-75d123cbf41296297ba690ecc08cb8b169b9e5e6.tar.bz2
portage-75d123cbf41296297ba690ecc08cb8b169b9e5e6.zip
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
-rwxr-xr-xbin/ebuild.sh3
1 files changed, 3 insertions, 0 deletions
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