Fix breakage in USE_EXPAND wildcard handling, from r12697. (trunk r12702)

svn path=/main/branches/2.1.6/; revision=12957

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b4291cfd7d8208bc2959cfd34c1c488fc46f91af..c662e4e609ca1de1259e39983e166f97c6463e04 100644 (file)
--- 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):
                """