diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-27 22:24:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-27 22:24:18 +0000 |
| commit | 3ad810d35e0cbbe232b205bbe9390aded6427aac (patch) | |
| tree | 6a977b166b17e9824fa3b9e997eb91457ff8e449 /bin | |
| parent | 754d9c9e899b9338407988cc802e39c0afc30812 (diff) | |
| download | portage-3ad810d35e0cbbe232b205bbe9390aded6427aac.tar.gz portage-3ad810d35e0cbbe232b205bbe9390aded6427aac.tar.bz2 portage-3ad810d35e0cbbe232b205bbe9390aded6427aac.zip | |
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. (trunk r6296:6297)
svn path=/main/branches/2.1.2/; revision=6298
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 12 |
1 files 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 |