From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 3 Dec 2007 23:06:12 +0000 (-0000)
Subject: Synchronize the conditional that triggers "${T}"/environment
X-Git-Tag: v2.2_pre1~232
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a5da554ea82ff3ab5ae6e359d86b981bd1467b1;p=portage.git

Synchronize the conditional that triggers "${T}"/environment
generation with the conditional that triggers distcc and
ccache FEATURES setup.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f4de63b15..6ea534de4 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1475,9 +1475,8 @@ preprocess_ebuild_env() {
 # === === === === === functions end, main part begins === === === === ===
 # === === === === === === === === === === === === === === === === === ===
 
-if [[ ${EBUILD_SH_ARGS} != "depend" ]] && [[ ${EBUILD_SH_ARGS}  != "clean" ]] && [[ ${EBUILD_SH_ARGS} != "setup" ]]; then
-	cd ${PORTAGE_TMPDIR} &> /dev/null
-	cd ${BUILD_PREFIX} &> /dev/null
+if [ -n "${EBUILD_SH_ARGS}" ] && \
+	! hasq ${EBUILD_SH_ARGS} clean depend help info nofetch ; then
 
 	if [ "$(id -nu)" == "portage" ] ; then
 		export USER=portage
@@ -1778,7 +1777,7 @@ fi
 
 # Save the env only for relevant phases.
 if [ -n "${EBUILD_SH_ARGS}" ] && \
-	! hasq ${EBUILD_SH_ARGS} clean help info nofetch ; then
+	! hasq ${EBUILD_SH_ARGS} clean depend help info nofetch ; then
 	# Save current environment and touch a success file. (echo for success)
 	umask 002
 	save_ebuild_env | filter_readonly_variables > "${T}/environment"