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 1SAFon-0007NS-Bj for garchives@archives.gentoo.org; Wed, 21 Mar 2012 07:18:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 286EBE0733; Wed, 21 Mar 2012 07:18:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE4D3E0733 for ; Wed, 21 Mar 2012 07:18:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D8FC1B4040 for ; Wed, 21 Mar 2012 07:18:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 44FF8E5403 for ; Wed, 21 Mar 2012 07:18:38 +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: <1332314214.500e0567432019835ef56e69d60266f9189c6700.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildBuild.py pym/_emerge/Scheduler.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: 500e0567432019835ef56e69d60266f9189c6700 X-VCS-Branch: master Date: Wed, 21 Mar 2012 07:18:38 +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: 194a6c90-dfba-4170-9cc5-c5e00eee6b1d X-Archives-Hash: a15f487213dca0620ab5e8fcd82550df commit: 500e0567432019835ef56e69d60266f9189c6700 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 21 07:16:54 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 21 07:16:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D500e0567 Map emerge --buildpkg=3Dn to FEATURES=3D-buildpkg. This will fix bug #409085. --- pym/_emerge/EbuildBuild.py | 5 +++-- pym/_emerge/Scheduler.py | 2 +- pym/_emerge/actions.py | 5 ++++- pym/_emerge/main.py | 2 -- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 27aa7ca..784a3e2 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -228,9 +228,10 @@ class EbuildBuild(CompositeTask): #buildsyspkg: Check if we need to _force_ binary package creation self._issyspkg =3D "buildsyspkg" in features and \ system_set.findAtomForPackage(pkg) and \ - not opts.buildpkg + "buildpkg" not in features and \ + opts.buildpkg !=3D 'n' =20 - if (opts.buildpkg or "buildpkg" in features or self._issyspkg) \ + if ("buildpkg" in features or self._issyspkg) \ and not self.opts.buildpkg_exclude.findAtomForPackage(pkg): =20 self._buildpkg =3D True diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 62b3589..bde6cf3 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -155,7 +155,7 @@ class Scheduler(PollScheduler): self._build_opts =3D self._build_opts_class() =20 for k in self._build_opts.__slots__: - setattr(self._build_opts, k, "--" + k.replace("_", "-") in myopts) + setattr(self._build_opts, k, myopts.get("--" + k.replace("_", "-"))) self._build_opts.buildpkg_exclude =3D InternalPackageSet( \ initial_atoms=3D" ".join(myopts.get("--buildpkg-exclude", [])).split(= ), \ allow_wildcard=3DTrue, allow_repo=3DTrue) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 090d9e1..cd3fd9f 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2727,8 +2727,11 @@ 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: + buildpkg =3D myopts.get("--buildpkg") + if buildpkg is True: settings.features.add("buildpkg") + elif buildpkg =3D=3D 'n': + settings.features.discard("buildpkg") =20 if "--quiet" in myopts: settings["PORTAGE_QUIET"]=3D"1" diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index c1adced..cf5f332 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1005,8 +1005,6 @@ def parse_opts(tmpcmdline, silent=3DFalse): =20 if myoptions.buildpkg in true_y: myoptions.buildpkg =3D True - else: - myoptions.buildpkg =3D None =20 if myoptions.buildpkg_exclude: bad_atoms =3D _find_bad_atoms(myoptions.buildpkg_exclude, less_strict=3D= True)