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 3a4273c8523478ff019d2078408ad3ab6c2ce931..bf1ba9019b13ca34a18863a61a8cc8d826fe3b1a 100755 (executable)
--- 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.