source ${T}/environment before the definition of qa_source() and qa_call() so that...

svn path=/main/branches/2.1.2/; revision=6298

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c60aed7aef407f1ccdc7eb25ec9a113f586513b8..f38d1e4057198df1fd197736b00c9067083a1c23 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -18,6 +18,12 @@ fi
 
 declare -rx EBUILD_PHASE
 
+if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "nofetch" ]; then
+       if [ -f "${T}/environment" ]; then
+               source "${T}/environment" >& /dev/null
+       fi
+fi
+
 # These two functions wrap sourcing and calling respectively.  At present they
 # perform a qa check to make sure eclasses and ebuilds and profiles don't mess
 # with shell opts (shopts).  Ebuilds/eclasses changing shopts should reset them 
@@ -43,12 +49,6 @@ qa_call() {
        return 0
 }
 
-if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "nofetch" ]; then
-       if [ -f "${T}/environment" ]; then
-               qa_source "${T}/environment" &>/dev/null
-       fi
-fi
-
 # subshell die support
 EBUILD_MASTER_PID=$$
 trap 'exit 1' SIGTERM