1 |
On Thu, Jun 1, 2017 at 5:48 PM, Brian Dolbec <dolsen@g.o> wrote: |
2 |
|
3 |
> On Thu, 1 Jun 2017 09:11:55 -0700 |
4 |
> Zac Medico <zmedico@g.o> wrote: |
5 |
> |
6 |
> > On Thu, Jun 1, 2017 at 8:50 AM, Zac Medico <zmedico@g.o> wrote: |
7 |
> > > |
8 |
> > > @@ -6224,10 +6283,10 @@ class depgraph(object): |
9 |
> > > iuses = |
10 |
> > > pkg.iuse.all |
11 |
> > > old_use = |
12 |
> > > self._pkg_use_enabled(pkg) |
13 |
> > > if myeb: |
14 |
> > > - |
15 |
> > > pkgsettings.setcpv(myeb) |
16 |
> > > + |
17 |
> > > now_use = self._pkg_use_enabled(myeb) |
18 |
> > > else: |
19 |
> > > |
20 |
> > > pkgsettings.setcpv(pkg) |
21 |
> > > - now_use = |
22 |
> > > pkgsettings["PORTAGE_USE"].split() |
23 |
> > > + |
24 |
> > > now_use = pkgsettings["PORTAGE_USE"].split() |
25 |
> > > forced_flags |
26 |
> > > = set() |
27 |
> > > |
28 |
> > > forced_flags.update(pkgsettings.useforce) |
29 |
> > > |
30 |
> > > forced_flags.update(pkgsettings.usemask) |
31 |
> > > |
32 |
> > |
33 |
> > |
34 |
> > I've updated the above code to generate forced_flags correctly: |
35 |
> > |
36 |
> > if myeb: |
37 |
> > now_use = self._pkg_use_enabled(myeb) |
38 |
> > forced_flags = set(chain( |
39 |
> > myeb.use.force, myeb.use.mask)) |
40 |
> > else: |
41 |
> > pkgsettings.setcpv(pkg) |
42 |
> > now_use = pkgsettings["PORTAGE_USE"].split() |
43 |
> > forced_flags = set(chain( |
44 |
> > pkgsettings.useforce, pkgsettings.usemask)) |
45 |
> > |
46 |
> |
47 |
> OK, LGTM |
48 |
> |
49 |
|
50 |
Thanks, pushed: |
51 |
|
52 |
https://gitweb.gentoo.org/proj/portage.git/commit/?id=60af7e2696b96b47b0cd9e70caabd10546206b8b |
53 |
-- |
54 |
Thanks, |
55 |
Zac |