1 |
From: Andrew Jeddeloh <andrew.jeddeloh@××××××.com> |
2 |
|
3 |
Do not ignore binpkgs when using --buildpkgonly. If binpackages exist |
4 |
that can be used, they should be. This prevents rebuilding binpkgs when |
5 |
using --emptytree with --buildpkgonly. |
6 |
|
7 |
Signed-off-by: Andrew Jeddeloh <andrew.jeddeloh@××××××.com> |
8 |
--- |
9 |
lib/_emerge/actions.py | 7 ------- |
10 |
1 file changed, 7 deletions(-) |
11 |
|
12 |
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py |
13 |
index 46cb02791..e5200d73d 100644 |
14 |
--- a/lib/_emerge/actions.py |
15 |
+++ b/lib/_emerge/actions.py |
16 |
@@ -2890,13 +2890,6 @@ def run_action(emerge_config): |
17 |
if "--usepkgonly" in emerge_config.opts: |
18 |
emerge_config.opts["--usepkg"] = True |
19 |
|
20 |
- if "--buildpkgonly" in emerge_config.opts: |
21 |
- # --buildpkgonly will not merge anything, so |
22 |
- # it cancels all binary package options. |
23 |
- for opt in ("--getbinpkg", "--getbinpkgonly", |
24 |
- "--usepkg", "--usepkgonly"): |
25 |
- emerge_config.opts.pop(opt, None) |
26 |
- |
27 |
# Populate the bintree with current --getbinpkg setting. |
28 |
# This needs to happen before: |
29 |
# * expand_set_arguments, in case any sets use the bintree |
30 |
-- |
31 |
2.18.0 |