summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-28 13:27:00 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-28 13:27:00 +0000
commit2384e53b022cd8923dac8fa5386f22700d433dce (patch)
tree1c489ae9870a6ca4f0a93351abf022d862712010
parente3e9352bd3622488a5c2524ddc7d071ae6b261cf (diff)
downloadportage-2384e53b022cd8923dac8fa5386f22700d433dce.tar.gz
portage-2384e53b022cd8923dac8fa5386f22700d433dce.tar.bz2
portage-2384e53b022cd8923dac8fa5386f22700d433dce.zip
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
-rwxr-xr-xbin/ebuild.sh6
1 files changed, 5 insertions, 1 deletions
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