Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Subject: Re: [gentoo-portage-dev] [PATCH] config.setcpv: fix handling of IUSE changes (bug 611896)
Date: Fri, 10 Mar 2017 01:46:38
Message-Id: CAMiTYSqUfTHwF2m+Ju8q00BNgijmkzuL9cu4pLEE+==X9wghPw@mail.gmail.com
In Reply to: Re: [gentoo-portage-dev] [PATCH] config.setcpv: fix handling of IUSE changes (bug 611896) by Brian Dolbec
1 On Thu, Mar 9, 2017 at 5:33 PM, Brian Dolbec <dolsen@g.o> wrote:
2 > On Thu, 9 Mar 2017 13:38:04 -0800
3 > Zac Medico <zmedico@g.o> wrote:
4 >
5 >> Fix setcpv to correctly regenerate USE when the IUSE differs from
6 >> the previous setcpv call. Changes in IUSE affect USE_EXPAND
7 >> wildcard expansion in the regenerate method.
8 >>
9 >> X-Gentoo-bug: 611896
10 >> X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=611896
11 >> ---
12 >> pym/portage/package/ebuild/config.py | 7 +++++--
13 >> 1 file changed, 5 insertions(+), 2 deletions(-)
14 >>
15 >> diff --git a/pym/portage/package/ebuild/config.py
16 >> b/pym/portage/package/ebuild/config.py index 4f7e5c9..ef29afe 100644
17 >> --- a/pym/portage/package/ebuild/config.py
18 >> +++ b/pym/portage/package/ebuild/config.py
19 >> @@ -1623,6 +1623,10 @@ class config(object):
20 >> elif previous_penv:
21 >> has_changed = True
22 >>
23 >> + if not (previous_iuse == iuse and
24 >> + previous_iuse_effective is not None ==
25 >> eapi_attrs.iuse_effective):
26 >> + has_changed = True
27 >> +
28 >> if has_changed:
29 >> self.reset(keeping_pkg=1)
30 >>
31 >> @@ -1645,8 +1649,7 @@ class config(object):
32 >>
33 >> # If reset() has not been called, it's safe to return
34 >> # early if IUSE has not changed.
35 >> - if not has_changed and previous_iuse == iuse and \
36 >> - (previous_iuse_effective is not None ==
37 >> eapi_attrs.iuse_effective):
38 >> + if not has_changed:
39 >> return
40 >>
41 >> # Filter out USE flags that aren't part of IUSE.
42 >> This has to
43 >
44 > looks good :)
45 >
46 > --
47 > Brian Dolbec <dolsen>
48 >
49 >
50
51 Thanks, merged:
52
53 https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ccd41702be7ed3f5bdbe123ec04349749b40c08
54
55 --
56 Thanks,
57 Zac