From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 26 Nov 2007 05:48:40 +0000 (-0000)
Subject: Automatically try to load environment.bz2 whenever
X-Git-Tag: v2.2_pre1~312
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9116d76089d00491f5f20a4d834408b7ff45c983;p=portage.git

Automatically try to load environment.bz2 whenever
"${T}/environment" does not exist, except for "clean"
and "depend" phases.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index efe71d664..46651e76a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1521,8 +1521,10 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then
 	unset BIN_PATH BIN BODY FUNC_SRC
 fi
 
-if hasq ${EBUILD_PHASE} config info prerm setup \
-	&& [ ! -f "${T}/environment" ] ; then
+# Automatically try to load environment.bz2 whenever
+# "${T}/environment" does not exist.
+if ! hasq ${EBUILD_SH_ARGS} clean depend && \
+	[ ! -f "${T}/environment" ] ; then
 	bzip2 -dc "${EBUILD%/*}"/environment.bz2 > \
 		"${T}/environment" 2> /dev/null
 	if [ -s "${T}/environment" ] ; then