From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Dec 2007 13:27:00 +0000 (-0000)
Subject: Always make sure that the depend phase triggers a source ${EBUILD}
X-Git-Tag: v2.2_pre1~108
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2384e53b022cd8923dac8fa5386f22700d433dce;p=portage.git

Always make sure that the depend phase triggers a source ${EBUILD}
call, even if "${T}"/environment happens to exist for some reason.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ecdcadba1..62a271752 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1637,7 +1637,11 @@ if ! hasq ${EBUILD_PHASE} clean depend && \
 fi
 
 if ! hasq ${EBUILD_PHASE} clean && \
-	( [ ! -f "${T}"/environment ] || hasq noauto ${FEATURES} ) ; then
+	(
+		hasq ${EBUILD_PHASE} depend || \
+		[ ! -f "${T}"/environment ] || \
+		hasq noauto ${FEATURES}
+	) ; then
 	# The bashrcs get an opportunity here to set aliases that will be expanded
 	# during sourcing of ebuilds and eclasses.
 	source_all_bashrcs