diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-18 14:18:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-18 14:18:41 +0000 |
| commit | 956087e60012f1b8224559422ff63f3acef869db (patch) | |
| tree | 769119394b1b0710feb4b7fc0d71072dd72c6200 | |
| parent | 9e067ef78a3c1ed08c5ebe61dc08e49689f983d1 (diff) | |
| download | portage-956087e60012f1b8224559422ff63f3acef869db.tar.gz portage-956087e60012f1b8224559422ff63f3acef869db.tar.bz2 portage-956087e60012f1b8224559422ff63f3acef869db.zip | |
Fix USE filtering code so that it doesn't rely on config.setcpv()
calling config.regenerate(). (trunk r8957)
svn path=/main/branches/2.1.2/; revision=8958
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 0f1fda2de..8a3426b34 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2376,7 +2376,9 @@ class config: # * 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. @@ -2409,7 +2411,7 @@ class config: 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 \ |