diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:17:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:17:00 +0000 |
| commit | 048be802ce0117b1a3c7f4e4bd33517bc303da16 (patch) | |
| tree | e025b3ca8a4edd20a8f540e2f3d7bfe43ade3163 | |
| parent | 3fdc7db6d828f7ad3485648343e09db494c0cb3b (diff) | |
| download | portage-048be802ce0117b1a3c7f4e4bd33517bc303da16.tar.gz portage-048be802ce0117b1a3c7f4e4bd33517bc303da16.tar.bz2 portage-048be802ce0117b1a3c7f4e4bd33517bc303da16.zip | |
Fix breakage in USE_EXPAND wildcard handling, from r12697. (trunk r12702)
svn path=/main/branches/2.1.6/; revision=12957
| -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 b4291cfd7..c662e4e60 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2109,7 +2109,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 @@ -2181,7 +2183,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): """ |