From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Mar 2007 22:22:40 +0000 (-0000)
Subject: source ${T}/environment before the definition of qa_source() and qa_call() so that... 
X-Git-Tag: v2.2_pre1~1530
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f10c445b79646124e47e9e0621f6ffb7b773e0e;p=portage.git

source ${T}/environment before the definition of qa_source() and qa_call() so that the call stack shows the original files and line numbers instead of those from ${T}/environment.  Thanks to Markus Ullmann <jokey@gentoo.org> for reporting.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 778f80dd5..ef9fbc73e 100755
--- 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