| 1 |
On Wed, 22 Mar 2017 09:32:36 -0700 |
| 2 |
Zac Medico <zmedico@g.o> wrote: |
| 3 |
|
| 4 |
> Fix pkg_use_display to test if the prefixed flag is in use.force or |
| 5 |
> use.mask, rather than the unprefixed flag. |
| 6 |
> |
| 7 |
> X-Gentoo-bug: 490562 |
| 8 |
> X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=490562 |
| 9 |
> --- |
| 10 |
> pym/_emerge/UseFlagDisplay.py | 19 +++++++++++++------ |
| 11 |
> 1 file changed, 13 insertions(+), 6 deletions(-) |
| 12 |
> |
| 13 |
> diff --git a/pym/_emerge/UseFlagDisplay.py |
| 14 |
> b/pym/_emerge/UseFlagDisplay.py index f460474..12820e9 100644 |
| 15 |
> --- a/pym/_emerge/UseFlagDisplay.py |
| 16 |
> +++ b/pym/_emerge/UseFlagDisplay.py |
| 17 |
> @@ -3,6 +3,7 @@ |
| 18 |
> |
| 19 |
> from __future__ import unicode_literals |
| 20 |
> |
| 21 |
> +import collections |
| 22 |
> from itertools import chain |
| 23 |
> import sys |
| 24 |
> |
| 25 |
> @@ -60,6 +61,10 @@ class UseFlagDisplay(object): |
| 26 |
> sort_separated = cmp_sort_key(_cmp_separated) |
| 27 |
> del _cmp_separated |
| 28 |
> |
| 29 |
> + |
| 30 |
> +_flag_info = collections.namedtuple('_flag_info', ('flag', |
| 31 |
> 'display')) + |
| 32 |
> + |
| 33 |
> def pkg_use_display(pkg, opts, modified_use=None): |
| 34 |
> settings = pkg.root_config.settings |
| 35 |
> use_expand = pkg.use.expand |
| 36 |
> @@ -81,27 +86,29 @@ def pkg_use_display(pkg, opts, modified_use=None): |
| 37 |
> if f.startswith(flag_prefix): |
| 38 |
> use_expand_flags.add(f) |
| 39 |
> use_enabled.setdefault( |
| 40 |
> - varname.upper(), |
| 41 |
> []).append(f[len(flag_prefix):]) |
| 42 |
> + varname.upper(), []).append( |
| 43 |
> + _flag_info(f, |
| 44 |
> f[len(flag_prefix):])) |
| 45 |
> for f in pkg.iuse.all: |
| 46 |
> if f.startswith(flag_prefix): |
| 47 |
> use_expand_flags.add(f) |
| 48 |
> if f not in use: |
| 49 |
> use_disabled.setdefault( |
| 50 |
> - varname.upper(), |
| 51 |
> []).append(f[len(flag_prefix):]) |
| 52 |
> + varname.upper(), |
| 53 |
> []).append( |
| 54 |
> + |
| 55 |
> _flag_info(f, f[len(flag_prefix):])) |
| 56 |
> var_order = set(use_enabled) |
| 57 |
> var_order.update(use_disabled) |
| 58 |
> var_order = sorted(var_order) |
| 59 |
> var_order.insert(0, 'USE') |
| 60 |
> use.difference_update(use_expand_flags) |
| 61 |
> - use_enabled['USE'] = list(use) |
| 62 |
> + use_enabled['USE'] = list(_flag_info(f, f) for f in use) |
| 63 |
> use_disabled['USE'] = [] |
| 64 |
> |
| 65 |
> for f in pkg.iuse.all: |
| 66 |
> if f not in use and \ |
| 67 |
> f not in use_expand_flags: |
| 68 |
> - use_disabled['USE'].append(f) |
| 69 |
> + use_disabled['USE'].append(_flag_info(f, f)) |
| 70 |
> |
| 71 |
> flag_displays = [] |
| 72 |
> for varname in var_order: |
| 73 |
> @@ -109,9 +116,9 @@ def pkg_use_display(pkg, opts, modified_use=None): |
| 74 |
> continue |
| 75 |
> flags = [] |
| 76 |
> for f in use_enabled.get(varname, []): |
| 77 |
> - flags.append(UseFlagDisplay(f, True, f in |
| 78 |
> forced_flags)) |
| 79 |
> + flags.append(UseFlagDisplay(f.display, True, |
| 80 |
> f.flag in forced_flags)) for f in use_disabled.get(varname, []): |
| 81 |
> - flags.append(UseFlagDisplay(f, False, f in |
| 82 |
> forced_flags)) |
| 83 |
> + flags.append(UseFlagDisplay(f.display, |
| 84 |
> False, f.flag in forced_flags)) if alphabetical_use: |
| 85 |
> flags.sort(key=UseFlagDisplay.sort_combined) |
| 86 |
> else: |
| 87 |
|
| 88 |
Sorry, Zac, I somehow missed this one... too busy with my head burried |
| 89 |
in twisted test fixes and new deps... |
| 90 |
|
| 91 |
Looks fine :) |
| 92 |
|
| 93 |
-- |
| 94 |
Brian Dolbec <dolsen> |
Archives