From d43e3f0b3c72b40bcb88e98fd445316d61d71ff6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Dec 2011 09:40:19 -0800 Subject: doebuild: disable noauto for binpkgs later This is safer since doebuild_environment() can modify FEATURES if setcpv isn't called before. --- pym/portage/package/ebuild/doebuild.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 \ -- cgit v1.2.3-1-g7c22