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

In config.setcpv() reuse split USE from built packages instead of splitting
them again.

svn path=/main/trunk/; revision=13573
---

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