diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-22 20:20:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-22 20:20:04 +0000 |
| commit | c36023833c7b58812fba559f89e418ce7d24ac44 (patch) | |
| tree | d7d2f84a2d7df822ecb48d66bd6e899162c46c8a /bin/ebuild.sh | |
| parent | a61072c37fa3095e9326d67cae63643b90792973 (diff) | |
| download | portage-c36023833c7b58812fba559f89e418ce7d24ac44.tar.gz portage-c36023833c7b58812fba559f89e418ce7d24ac44.tar.bz2 portage-c36023833c7b58812fba559f89e418ce7d24ac44.zip | |
Don't call preprocess_ebuild_env() unless EBUILD_SH_ARGS is set
since otherwise it can interfere with the environment for things
like the "package" phase. (trunk r8603)
svn path=/main/branches/2.1.2/; revision=8604
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index bf1ba9019..e03b18fa3 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1599,7 +1599,7 @@ fi if hasq ${EBUILD_SH_ARGS} clean ; then true elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then - if [ "${PN}" == "portage" ] ; then + if [ "${PN}" == "portage" ] && [ -n "${EBUILD_SH_ARGS}" ] ; then # When portage reinstalls itself, during inst/rm phases, the # environment may have been saved by a different version of ebuild.sh, # so it can't trusted that it's been properly filtered. Therefore, |