| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 21:45:55 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13574 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In config.setcpv() reuse split USE from built packages instead of splitting |
| 9 |
them again. (trunk r13573) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 21:45:01 UTC (rev 13573) |
| 14 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 21:45:55 UTC (rev 13574) |
| 15 |
@@ -2082,8 +2082,7 @@ |
| 16 |
settings = self.settings |
| 17 |
use = self.built_use |
| 18 |
if use is None: |
| 19 |
- use = settings['PORTAGE_USE'] |
| 20 |
- use = set(use.split()) |
| 21 |
+ use = frozenset(settings['PORTAGE_USE'].split()) |
| 22 |
values['ACCEPT_LICENSE'] = self._accept_license(use, settings) |
| 23 |
values['PORTAGE_RESTRICT'] = self._restrict(use, settings) |
| 24 |
return values |
| 25 |
@@ -2222,7 +2221,7 @@ |
| 26 |
mydb = pkg.metadata |
| 27 |
args_hash = (mycpv, id(pkg)) |
| 28 |
if pkg.built: |
| 29 |
- built_use = pkg.metadata['USE'] |
| 30 |
+ built_use = pkg.use.enabled |
| 31 |
else: |
| 32 |
args_hash = (mycpv, id(mydb)) |
Archives