From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF220138334 for ; Sat, 6 Oct 2018 01:03:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CC02E0866; Sat, 6 Oct 2018 01:03:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6041BE0866 for ; Sat, 6 Oct 2018 01:03:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7225D335C47 for ; Sat, 6 Oct 2018 01:03:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ABF042D for ; Sat, 6 Oct 2018 01:03:06 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1538780927.2e87bfaabd0550f0b34556470b28906d30bd5e48.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/actions.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2e87bfaabd0550f0b34556470b28906d30bd5e48 X-VCS-Branch: master Date: Sat, 6 Oct 2018 01:03:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f0f4bacd-279b-466d-911a-ffbe1e00bf60 X-Archives-Hash: 08b15ab4ef5f21ebd2dbdd8c47e289f6 commit: 2e87bfaabd0550f0b34556470b28906d30bd5e48 Author: Andrew Jeddeloh coreos com> AuthorDate: Fri Oct 5 22:35:04 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 5 23:08:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e87bfaa emerge: don't ignore binpkgs with buildpkgonly Do not ignore binpkgs when using --buildpkgonly. If binpackages exist that can be used, they should be. This prevents rebuilding binpkgs when using --emptytree with --buildpkgonly. Signed-off-by: Andrew Jeddeloh coreos.com> Signed-off-by: Zac Medico gentoo.org> lib/_emerge/actions.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 46cb02791..e5200d73d 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -2890,13 +2890,6 @@ def run_action(emerge_config): if "--usepkgonly" in emerge_config.opts: emerge_config.opts["--usepkg"] = True - if "--buildpkgonly" in emerge_config.opts: - # --buildpkgonly will not merge anything, so - # it cancels all binary package options. - for opt in ("--getbinpkg", "--getbinpkgonly", - "--usepkg", "--usepkgonly"): - emerge_config.opts.pop(opt, None) - # Populate the bintree with current --getbinpkg setting. # This needs to happen before: # * expand_set_arguments, in case any sets use the bintree