From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Nov 2007 20:19:22 +0000 (-0000)
Subject: Don't call preprocess_ebuild_env() unless EBUILD_SH_ARGS is set
X-Git-Tag: v2.2_pre1~348
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7a50212d0254cc0d5ab777e36510310a41f3c1f;p=portage.git

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.

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

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,