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