From a7a50212d0254cc0d5ab777e36510310a41f3c1f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 22 Nov 2007 20:19:22 +0000 Subject: 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 --- bin/ebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/ebuild.sh') 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, -- cgit v1.2.3-1-g7c22