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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bf1ba9019b13ca34a18863a61a8cc8d826fe3b1a..e03b18fa337de6f07be8de71457793b80537f4ae 100755 (executable)
--- 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,