From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 4 Oct 2012 22:17:57 +0000 (-0700)
Subject: ebuild.sh: comment on noauto behavior
X-Git-Tag: v2.2.0_alpha136~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e5dcfaf9c57da3be20ae673f65c3b5b8d9827c2;p=portage.git

ebuild.sh: comment on noauto behavior
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index a74a84851..de54e22eb 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -520,10 +520,12 @@ if ___eapi_enables_globstar; then
 	shopt -s globstar
 fi
 
+# Source the ebuild every time for FEATURES=noauto, so that ebuild
+# modifications take effect immediately.
 if ! has "$EBUILD_PHASE" clean cleanrm ; then
 	if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \
-		-f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
-		has noauto $FEATURES ; then
+		-f $PORTAGE_BUILDDIR/.ebuild_changed || \
+		" ${FEATURES} " == *" noauto "* ]] ; then
 		# The bashrcs get an opportunity here to set aliases that will be expanded
 		# during sourcing of ebuilds and eclasses.
 		__source_all_bashrcs