From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 10 Dec 2011 17:40:19 +0000 (-0800)
Subject: doebuild: disable noauto for binpkgs later
X-Git-Tag: v2.2.0_alpha80~22
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d43e3f0b3c72b40bcb88e98fd445316d61d71ff6;p=portage.git

doebuild: disable noauto for binpkgs later

This is safer since doebuild_environment() can modify FEATURES if
setcpv isn't called before.
---

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 4955c662b..865ccd49d 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -560,10 +560,7 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
 			os.path.dirname(os.path.dirname(pkgdir)))
 	else:
 		repo_config = None
-		# FEATURES=noauto only makes sense for porttree, and we don't want
-		# it to trigger redundant sourcing of the ebuild for api consumers
-		# that are using binary packages
-		mysettings.features.discard("noauto")
+
 	mf = None
 	if "strict" in features and \
 		"digest" not in features and \
@@ -738,6 +735,13 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
 			if rval != os.EX_OK:
 				return rval
 
+		else:
+			# FEATURES=noauto only makes sense for porttree, and we don't want
+			# it to trigger redundant sourcing of the ebuild for API consumers
+			# that are using binary packages
+			if "noauto" in mysettings.features:
+				mysettings.features.discard("noauto")
+
 		# The info phase is special because it uses mkdtemp so and
 		# user (not necessarily in the portage group) can run it.
 		if mydo not in ('info',) and \