summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-18 14:14:22 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-18 14:14:22 +0000
commit1260ca830f28cdbee891ebce82f1f0989eabba3e (patch)
treebcfb83806ebae29a89bae7f79b441661f825eb17
parent2668d2c0a2658a3fe084f971c8bb54975c056037 (diff)
downloadportage-1260ca830f28cdbee891ebce82f1f0989eabba3e.tar.gz
portage-1260ca830f28cdbee891ebce82f1f0989eabba3e.tar.bz2
portage-1260ca830f28cdbee891ebce82f1f0989eabba3e.zip
Fix USE filtering code so that it doesn't rely on config.setcpv()
calling config.regenerate(). svn path=/main/trunk/; revision=8957
-rw-r--r--pym/portage/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 7e1998b3a..663d84685 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2395,7 +2395,9 @@ class config(object):
# * Forced flags, such as those from {,package}use.force
# * build and bootstrap flags used by bootstrap.sh
- if self.mycpv:
+ if True:
+ # Do this even when there's no package since setcpv() can
+ # optimize away regenerate() calls.
iuse_implicit = set(iuse)
# Flags derived from ARCH.
@@ -2428,7 +2430,7 @@ class config(object):
iuse_grep = "^(%s)$" % "|".join(sorted(iuse_grep))
else:
iuse_grep = ""
- self.configdict["pkg"]["PORTAGE_IUSE"] = iuse_grep
+ self["PORTAGE_IUSE"] = iuse_grep
usesplit = [x for x in usesplit if \
x in iuse_implicit and \