Remove "myarg" from the ebuild.sh env before it is saved so that it doesn't interfere...

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3e96503c20e24757dc1fda7e761346ddc98af8e2..b6b7fa533ed38bbceded1780342bacc488c41d01 100755 (executable)
--- 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