1 |
On Thu, 9 Mar 2017 13:38:04 -0800 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Fix setcpv to correctly regenerate USE when the IUSE differs from |
5 |
> the previous setcpv call. Changes in IUSE affect USE_EXPAND |
6 |
> wildcard expansion in the regenerate method. |
7 |
> |
8 |
> X-Gentoo-bug: 611896 |
9 |
> X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=611896 |
10 |
> --- |
11 |
> pym/portage/package/ebuild/config.py | 7 +++++-- |
12 |
> 1 file changed, 5 insertions(+), 2 deletions(-) |
13 |
> |
14 |
> diff --git a/pym/portage/package/ebuild/config.py |
15 |
> b/pym/portage/package/ebuild/config.py index 4f7e5c9..ef29afe 100644 |
16 |
> --- a/pym/portage/package/ebuild/config.py |
17 |
> +++ b/pym/portage/package/ebuild/config.py |
18 |
> @@ -1623,6 +1623,10 @@ class config(object): |
19 |
> elif previous_penv: |
20 |
> has_changed = True |
21 |
> |
22 |
> + if not (previous_iuse == iuse and |
23 |
> + previous_iuse_effective is not None == |
24 |
> eapi_attrs.iuse_effective): |
25 |
> + has_changed = True |
26 |
> + |
27 |
> if has_changed: |
28 |
> self.reset(keeping_pkg=1) |
29 |
> |
30 |
> @@ -1645,8 +1649,7 @@ class config(object): |
31 |
> |
32 |
> # If reset() has not been called, it's safe to return |
33 |
> # early if IUSE has not changed. |
34 |
> - if not has_changed and previous_iuse == iuse and \ |
35 |
> - (previous_iuse_effective is not None == |
36 |
> eapi_attrs.iuse_effective): |
37 |
> + if not has_changed: |
38 |
> return |
39 |
> |
40 |
> # Filter out USE flags that aren't part of IUSE. |
41 |
> This has to |
42 |
|
43 |
looks good :) |
44 |
|
45 |
-- |
46 |
Brian Dolbec <dolsen> |