| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-09 03:50:36 +0000 (Tue, 09 Feb 2010) |
| 3 |
New Revision: 15331 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/create_world_atom.py |
| 7 |
Log: |
| 8 |
Use Atom.cp instead of dep_getkey(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/create_world_atom.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/create_world_atom.py 2010-02-09 03:41:02 UTC (rev 15330) |
| 14 |
+++ main/trunk/pym/_emerge/create_world_atom.py 2010-02-09 03:50:36 UTC (rev 15331) |
| 15 |
@@ -15,7 +15,7 @@ |
| 16 |
arg_atom = args_set.findAtomForPackage(pkg) |
| 17 |
if not arg_atom: |
| 18 |
return None |
| 19 |
- cp = portage.dep_getkey(arg_atom) |
| 20 |
+ cp = arg_atom.cp |
| 21 |
new_world_atom = cp |
| 22 |
sets = root_config.sets |
| 23 |
portdb = root_config.trees["porttree"].dbapi |
| 24 |
@@ -76,15 +76,14 @@ |
| 25 |
# can't be safely excluded from world if they are slotted. |
| 26 |
system_atom = sets["system"].findAtomForPackage(pkg) |
| 27 |
if system_atom: |
| 28 |
- if not portage.dep_getkey(system_atom).startswith("virtual/"): |
| 29 |
+ if not system_atom.cp.startswith("virtual/"): |
| 30 |
return None |
| 31 |
# System virtuals aren't safe to exclude from world since they can |
| 32 |
# match multiple old-style virtuals but only one of them will be |
| 33 |
# pulled in by update or depclean. |
| 34 |
- providers = portdb.settings.getvirtuals().get( |
| 35 |
- portage.dep_getkey(system_atom)) |
| 36 |
+ providers = portdb.settings.getvirtuals().get(system_atom.cp) |
| 37 |
if providers and len(providers) == 1 and \ |
| 38 |
- portage.dep_getkey(providers[0]) == cp: |
| 39 |
+ providers[0].cp == arg_atom.cp: |
| 40 |
return None |
| 41 |
return new_world_atom |
Archives