From 3ad810d35e0cbbe232b205bbe9390aded6427aac Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 27 Mar 2007 22:24:18 +0000 Subject: 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 for reporting. (trunk r6296:6297) svn path=/main/branches/2.1.2/; revision=6298 --- bin/ebuild.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index c60aed7ae..f38d1e405 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 -- cgit v1.2.3-1-g7c22