| 1 |
commit: 2e87bfaabd0550f0b34556470b28906d30bd5e48 |
| 2 |
Author: Andrew Jeddeloh <andrew.jeddeloh <AT> coreos <DOT> com> |
| 3 |
AuthorDate: Fri Oct 5 22:35:04 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 5 23:08:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e87bfaa |
| 7 |
|
| 8 |
emerge: don't ignore binpkgs with buildpkgonly |
| 9 |
|
| 10 |
Do not ignore binpkgs when using --buildpkgonly. If binpackages exist |
| 11 |
that can be used, they should be. This prevents rebuilding binpkgs when |
| 12 |
using --emptytree with --buildpkgonly. |
| 13 |
|
| 14 |
Signed-off-by: Andrew Jeddeloh <andrew.jeddeloh <AT> coreos.com> |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
lib/_emerge/actions.py | 7 ------- |
| 18 |
1 file changed, 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py |
| 21 |
index 46cb02791..e5200d73d 100644 |
| 22 |
--- a/lib/_emerge/actions.py |
| 23 |
+++ b/lib/_emerge/actions.py |
| 24 |
@@ -2890,13 +2890,6 @@ def run_action(emerge_config): |
| 25 |
if "--usepkgonly" in emerge_config.opts: |
| 26 |
emerge_config.opts["--usepkg"] = True |
| 27 |
|
| 28 |
- if "--buildpkgonly" in emerge_config.opts: |
| 29 |
- # --buildpkgonly will not merge anything, so |
| 30 |
- # it cancels all binary package options. |
| 31 |
- for opt in ("--getbinpkg", "--getbinpkgonly", |
| 32 |
- "--usepkg", "--usepkgonly"): |
| 33 |
- emerge_config.opts.pop(opt, None) |
| 34 |
- |
| 35 |
# Populate the bintree with current --getbinpkg setting. |
| 36 |
# This needs to happen before: |
| 37 |
# * expand_set_arguments, in case any sets use the bintree |
Archives