diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-13 15:47:13 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 15:47:13 -0700 |
| commit | 6b19f71b39b6af43307abf20654511bace041217 (patch) | |
| tree | 27db4710e44a71f89b875714cc2ab556282b7c03 /pym/_emerge/resolver/output_helpers.py | |
| parent | 34fd6700ba3ff1e18865322b37be31851570ab83 (diff) | |
| download | portage-6b19f71b39b6af43307abf20654511bace041217.tar.gz portage-6b19f71b39b6af43307abf20654511bace041217.tar.bz2 portage-6b19f71b39b6af43307abf20654511bace041217.zip | |
Bind FEATURES=-test to USE=-test for bug #373209.
Also, make options like emerge --newuse ignore the state of USE=test,
since users typically don't want to trigger a bunch of rebuilds when
they enable or disable FEATURES=test.
Diffstat (limited to 'pym/_emerge/resolver/output_helpers.py')
| -rw-r--r-- | pym/_emerge/resolver/output_helpers.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index e751dd8e4..dc622bd9d 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """Contains private support functions for the Display class @@ -17,6 +17,7 @@ from portage._sets.base import InternalPackageSet from portage.output import (blue, bold, colorize, create_color_func, green, red, teal, yellow) bad = create_color_func("BAD") +from portage.package.ebuild.config import _feature_flags from portage.util import shlex_split, writemsg from portage.versions import catpkgsplit @@ -245,7 +246,6 @@ def _format_size(mysize): mystr=mystr[:mycount]+","+mystr[mycount:] return mystr+" kB" - def _create_use_string(conf, name, cur_iuse, iuse_forced, cur_use, old_iuse, old_use, is_new, reinst_flags): @@ -299,7 +299,9 @@ def _create_use_string(conf, name, cur_iuse, iuse_forced, cur_use, elif flag in old_use: flag_str = green("-" + flag) + "*" if flag_str: - if flag in iuse_forced: + if flag in _feature_flags: + flag_str = "{" + flag_str + "}" + elif flag in iuse_forced: flag_str = "(" + flag_str + ")" if isEnabled: enabled.append(flag_str) |