commit: 2e87bfaabd0550f0b34556470b28906d30bd5e48
Author: Andrew Jeddeloh <andrew.jeddeloh <AT> coreos <DOT> com>
AuthorDate: Fri Oct 5 22:35:04 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <andrew.jeddeloh <AT> coreos.com>
Signed-off-by: Zac Medico <zmedico <AT> 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
