summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 21:45:55 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 21:45:55 +0000
commit21aee8203a3916ba3aa51f9058cf0656a911503d (patch)
tree43013adf2905d32355f55840d6f3c6d4cfe3bb97
parentEnable use() qa checks via PORTAGE_IUSE for all ebuild phases and for binary (diff)
downloadportage-multirepo-21aee8203a3916ba3aa51f9058cf0656a911503d.tar.gz
portage-multirepo-21aee8203a3916ba3aa51f9058cf0656a911503d.tar.bz2
portage-multirepo-21aee8203a3916ba3aa51f9058cf0656a911503d.zip
In config.setcpv() reuse split USE from built packages instead of splitting
them again. (trunk r13573) svn path=/main/branches/2.1.6/; revision=13574
-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 d09797f0..68d03779 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2082,8 +2082,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
@@ -2222,7 +2221,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))