diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-23 23:22:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-23 23:22:08 +0000 |
| commit | 5ede2e2e08bee46023b2ac0ccb4c301ec5bda5dc (patch) | |
| tree | 7de884b3292188c8fece761a46d38b9878cb145e | |
| parent | 0294e8740152d957d52898c3d5a73c74a998b1ce (diff) | |
| download | portage-5ede2e2e08bee46023b2ac0ccb4c301ec5bda5dc.tar.gz portage-5ede2e2e08bee46023b2ac0ccb4c301ec5bda5dc.tar.bz2 portage-5ede2e2e08bee46023b2ac0ccb4c301ec5bda5dc.zip | |
Make USE_EXPAND wildcard expansion more efficient, and prevent possible
duplicates.
svn path=/main/trunk/; revision=12703
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 5 insertions, 4 deletions
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 |