From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 21:45:55 +0000 (-0000)
Subject: In config.setcpv() reuse split USE from built packages instead of splitting
X-Git-Tag: v2.1.6.12~7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=21aee8203a3916ba3aa51f9058cf0656a911503d;p=portage.git

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
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d09797f07..68d037798 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))