diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-09-23 20:12:14 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-09-23 20:12:14 -0700 |
commit | a8b9e099d08e72c10046639a15c3c7c02045c4da (patch) | |
tree | 4960e58467b90bd084cbd7d6c5659d05f77fd136 /pym/_emerge/resolver/output_helpers.py | |
parent | 3cf984f540e99df61ae24246fe76ed56afb277aa (diff) | |
download | portage-a8b9e099d08e72c10046639a15c3c7c02045c4da.tar.gz portage-a8b9e099d08e72c10046639a15c3c7c02045c4da.tar.bz2 portage-a8b9e099d08e72c10046639a15c3c7c02045c4da.zip |
_create_use_string: pass in feature_flags argv2.2.0_alpha132
This allows them to be looked up outside of the USE_EXPAND loop.
Diffstat (limited to 'pym/_emerge/resolver/output_helpers.py')
-rw-r--r-- | pym/_emerge/resolver/output_helpers.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index 23b056c3e..7016ec294 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -14,11 +14,9 @@ import sys from portage import os from portage import _encodings, _unicode_encode from portage._sets.base import InternalPackageSet -from portage.eapi import _get_eapi_attrs from portage.output import (blue, bold, colorize, create_color_func, green, red, teal, turquoise, yellow) bad = create_color_func("BAD") -from portage.package.ebuild.config import _get_feature_flags from portage.util import shlex_split, writemsg from portage.util.SlotObject import SlotObject from portage.versions import catpkgsplit @@ -248,9 +246,9 @@ def _format_size(mysize): mystr=mystr[:mycount]+","+mystr[mycount:] return mystr+" kB" -def _create_use_string(pkg, conf, name, cur_iuse, iuse_forced, cur_use, +def _create_use_string(conf, name, cur_iuse, iuse_forced, cur_use, old_iuse, old_use, - is_new, reinst_flags): + is_new, feature_flags, reinst_flags): if not conf.print_use_string: return "" @@ -268,7 +266,7 @@ def _create_use_string(pkg, conf, name, cur_iuse, iuse_forced, cur_use, any_iuse = cur_iuse.union(old_iuse) any_iuse = list(any_iuse) any_iuse.sort() - feature_flags = _get_feature_flags(_get_eapi_attrs(pkg.metadata["EAPI"])) + for flag in any_iuse: flag_str = None isEnabled = False |