From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RZQuc-0003Zl-ID for garchives@archives.gentoo.org; Sat, 10 Dec 2011 17:40:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5BD321C0DD; Sat, 10 Dec 2011 17:40:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9993121C0DD for ; Sat, 10 Dec 2011 17:40:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28C041B402C for ; Sat, 10 Dec 2011 17:40:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6FAA380042 for ; Sat, 10 Dec 2011 17:40:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d43e3f0b3c72b40bcb88e98fd445316d61d71ff6 Date: Sat, 10 Dec 2011 17:40:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 53e747e5-e8f6-4762-8802-5771b2219bac X-Archives-Hash: 617c65d1c7e767683cfc52d4b9788eb1 commit: d43e3f0b3c72b40bcb88e98fd445316d61d71ff6 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 10 17:40:19 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 10 17:40:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd43e3f0b 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 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 4955c66..865ccd4 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -560,10 +560,7 @@ def doebuild(myebuild, mydo, _unused=3DNone, setting= s=3DNone, debug=3D0, listonly=3D0, os.path.dirname(os.path.dirname(pkgdir))) else: repo_config =3D None - # FEATURES=3Dnoauto 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 =3D None if "strict" in features and \ "digest" not in features and \ @@ -738,6 +735,13 @@ def doebuild(myebuild, mydo, _unused=3DNone, setting= s=3DNone, debug=3D0, listonly=3D0, if rval !=3D os.EX_OK: return rval =20 + else: + # FEATURES=3Dnoauto 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 \