From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Feb 2009 23:16:16 +0000 (-0000)
Subject: Fix breakage in USE_EXPAND wildcard handling, from r12697.
X-Git-Tag: v2.2_rc24~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0294e8740152d957d52898c3d5a73c74a998b1ce;p=portage.git

Fix breakage in USE_EXPAND wildcard handling, from r12697.

svn path=/main/trunk/; revision=12702
---

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):
 		"""