From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Feb 2009 23:22:08 +0000 (-0000)
Subject: Make USE_EXPAND wildcard expansion more efficient, and prevent possible
X-Git-Tag: v2.2_rc24~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ede2e2e08bee46023b2ac0ccb4c301ec5bda5dc;p=portage.git

Make USE_EXPAND wildcard expansion more efficient, and prevent possible
duplicates.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e5d4d5158..4eb99c2db 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2147,10 +2147,11 @@ class config(object):
 			if has_wildcard:
 				# * means to enable everything in IUSE that's not masked
 				if has_iuse:
-					for x in iuse_implicit:
-						if x[:prefix_len] == prefix and x not in self.usemask:
-							suffix = x[prefix_len:]
-							var_split.append(suffix)
+					for suffix in has_iuse:
+						x = prefix + suffix
+						if x not in usemask:
+							if suffix not in expand_flags:
+								var_split.append(suffix)
 							use.add(x)
 				else:
 					# If there is a wildcard and no matching flags in IUSE then