summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 21:45:01 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 21:45:01 +0000
commit3c412f0bb10e947ff2b24833fb2f21d77370453b (patch)
tree10bffc79b2aba6c11c88d77bdc357b37cbd5f11b
parentd4efe1af81cffdfb62f29305be0af91ed8d91306 (diff)
downloadportage-3c412f0bb10e947ff2b24833fb2f21d77370453b.tar.gz
portage-3c412f0bb10e947ff2b24833fb2f21d77370453b.tar.bz2
portage-3c412f0bb10e947ff2b24833fb2f21d77370453b.zip
In config.setcpv() reuse split USE from built packages instead of splitting
them again. svn path=/main/trunk/; revision=13573
-rw-r--r--pym/portage/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2fe76c98b..e18531032 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2092,8 +2092,7 @@ class config(object):
settings = self.settings
use = self.built_use
if use is None:
- use = settings['PORTAGE_USE']
- use = set(use.split())
+ use = frozenset(settings['PORTAGE_USE'].split())
values['ACCEPT_LICENSE'] = self._accept_license(use, settings)
values['PORTAGE_RESTRICT'] = self._restrict(use, settings)
return values
@@ -2232,7 +2231,7 @@ class config(object):
mydb = pkg.metadata
args_hash = (mycpv, id(pkg))
if pkg.built:
- built_use = pkg.metadata['USE']
+ built_use = pkg.use.enabled
else:
args_hash = (mycpv, id(mydb))