From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Nov 2007 19:54:08 +0000 (-0000)
Subject: When portage reinstalls itself, during inst/rm phases, the
X-Git-Tag: v2.1.4~241
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a61072c37fa3095e9326d67cae63643b90792973;p=portage.git

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,
always preprocess the environment when ${PN} == portage.
(trunk r8601)

svn path=/main/branches/2.1.2/; revision=8602
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3a4273c85..bf1ba9019 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1599,6 +1599,13 @@ fi
 if hasq ${EBUILD_SH_ARGS} clean ; then
 	true
 elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then
+	if [ "${PN}" == "portage" ] ; 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,
+		# always preprocess the environment when ${PN} == portage.
+		preprocess_ebuild_env
+	fi
 	source "${T}"/environment
 else
 	# *DEPEND and IUSE will be set during the sourcing of the ebuild.