diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-23 23:16:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-23 23:16:16 +0000 |
| commit | 0294e8740152d957d52898c3d5a73c74a998b1ce (patch) | |
| tree | 4f5792fc8a6612460361ac60dfa89167cedd0bb7 | |
| parent | 7c4755fa45fe81341a652b1a0af93fd672dc460d (diff) | |
| download | portage-0294e8740152d957d52898c3d5a73c74a998b1ce.tar.gz portage-0294e8740152d957d52898c3d5a73c74a998b1ce.tar.bz2 portage-0294e8740152d957d52898c3d5a73c74a998b1ce.zip | |
Fix breakage in USE_EXPAND wildcard handling, from r12697.
svn path=/main/trunk/; revision=12702
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 90a304415..e5d4d5158 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2119,7 +2119,9 @@ class config(object): if ebuild_force_test: self.usemask.discard("test") - use.difference_update([x for x in use if x not in iuse_implicit]) + # Allow _* flags from USE_EXPAND wildcards to pass through here. + use.difference_update([x for x in use \ + if x not in iuse_implicit and x[-2:] != '_*']) # Use the calculated USE flags to regenerate the USE_EXPAND flags so # that they are consistent. For optimal performance, use slice @@ -2191,7 +2193,8 @@ class config(object): # attribute since we still want to be able to see global USE # settings for things like emerge --info. - self.configdict["pkg"]["PORTAGE_USE"] = " ".join(sorted(use)) + self.configdict["pkg"]["PORTAGE_USE"] = \ + " ".join(sorted(x for x in use if x[-2:] != '_*')) def _get_implicit_iuse(self): """ |