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 1Qyab5-0003rZ-RT for garchives@archives.gentoo.org; Wed, 31 Aug 2011 02:32:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF62D21C061; Wed, 31 Aug 2011 02:32:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C08CB21C061 for ; Wed, 31 Aug 2011 02:32:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A5E41B4001 for ; Wed, 31 Aug 2011 02:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9108880040 for ; Wed, 31 Aug 2011 02:32:02 +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/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildBuild.py pym/_emerge/actions.py pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c47394cb28a841d5b7399f548c2507a85a158bdd Date: Wed, 31 Aug 2011 02:32:02 +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: X-Archives-Hash: a766bec20ac3d81296dff5cc314f0b2c commit: c47394cb28a841d5b7399f548c2507a85a158bdd Author: Zac Medico gentoo org> AuthorDate: Wed Aug 31 02:31:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Aug 31 02:31:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc47394cb Respect package.env buildpkg FEATURES settings. This will fix bug #318897. --- pym/_emerge/EbuildBuild.py | 2 +- pym/_emerge/actions.py | 3 +++ pym/_emerge/main.py | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 0144cfc..2b0f412 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -225,7 +225,7 @@ class EbuildBuild(CompositeTask): system_set.findAtomForPackage(pkg) and \ not opts.buildpkg =20 - if opts.buildpkg or self._issyspkg: + if opts.buildpkg or "buildpkg" in features or self._issyspkg: =20 self._buildpkg =3D True =20 diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 882a2db..3477c19 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2731,6 +2731,9 @@ def adjust_config(myopts, settings): settings["EMERGE_WARNING_DELAY"] =3D str(EMERGE_WARNING_DELAY) settings.backup_changes("EMERGE_WARNING_DELAY") =20 + if "--buildpkg" in myopts: + settings.features.add("buildpkg") + if "--quiet" in myopts or "--quiet-build" in myopts: settings["PORTAGE_QUIET"]=3D"1" settings.backup_changes("PORTAGE_QUIET") diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 84c4c58..343fd58 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1545,6 +1545,11 @@ def emerge_main(args=3DNone): settings, trees, mtimedb =3D load_emerge_config(trees=3Dtrees) portdb =3D trees[settings["ROOT"]]["porttree"].dbapi =20 + # NOTE: adjust_configs() can map options to FEATURES, so any relevant + # options adjustments should be made prior to calling adjust_configs(). + if "--buildpkgonly" in myopts: + myopts["--buildpkg"] =3D True + adjust_configs(myopts, trees) apply_priorities(settings) =20 @@ -1587,9 +1592,6 @@ def emerge_main(args=3DNone): if "--usepkgonly" in myopts: myopts["--usepkg"] =3D True =20 - if "buildpkg" in settings.features or "--buildpkgonly" in myopts: - myopts["--buildpkg"] =3D True - if "--buildpkgonly" in myopts: # --buildpkgonly will not merge anything, so # it cancels all binary package options.