diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-11-19 12:50:54 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-19 12:50:54 -0800 |
| commit | 33fdbb7d893dbb2e9693a9e6f127a96889805d52 (patch) | |
| tree | 0ad249176e033d8f16b945b3b27d2dfdb98dabb9 | |
| parent | Support syncing over ssh with ssh://host//path. (diff) | |
| download | portage-33fdbb7d893dbb2e9693a9e6f127a96889805d52.tar.gz portage-33fdbb7d893dbb2e9693a9e6f127a96889805d52.tar.bz2 portage-33fdbb7d893dbb2e9693a9e6f127a96889805d52.zip | |
emerge --info: Fix USE_EXPAND display
This makes the USE_EXPAND variables consistent with the USE flag
settings.
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 0a920b3e8..b1d8f67a7 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1838,6 +1838,24 @@ class config(object): myflags.difference_update(self.usemask) self.configlist[-1]["USE"]= " ".join(sorted(myflags)) + if self.mycpv is None: + # Generate global USE_EXPAND variables settings that are + # consistent with USE, for display by emerge --info. For + # package instances, these are instead generated via + # setcpv(). + for k in use_expand: + prefix = k.lower() + '_' + prefix_len = len(prefix) + expand_flags = set( x[prefix_len:] for x in myflags \ + if x[:prefix_len] == prefix ) + var_split = use_expand_dict.get(k, '').split() + var_split = [ x for x in var_split if x in expand_flags ] + var_split.extend(sorted(expand_flags.difference(var_split))) + if var_split: + self.configlist[-1][k] = ' '.join(var_split) + elif k in self: + self.configlist[-1][k] = '' + @property def virts_p(self): warnings.warn("portage config.virts_p attribute " + \ |