| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 21:54:54 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15401 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Use Atom.cp instead of dep_getkey. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/depgraph.py 2010-02-19 21:26:58 UTC (rev 15400) |
| 15 |
+++ main/trunk/pym/_emerge/depgraph.py 2010-02-19 21:54:54 UTC (rev 15401) |
| 16 |
@@ -1819,8 +1819,7 @@ |
| 17 |
pprovided_match = False |
| 18 |
for virt_choice in virtuals.get(atom.cp, []): |
| 19 |
expanded_atom = portage.dep.Atom( |
| 20 |
- atom.replace(atom.cp, |
| 21 |
- portage.dep_getkey(virt_choice), 1)) |
| 22 |
+ atom.replace(atom.cp, virt_choice.cp, 1)) |
| 23 |
pprovided = pprovideddict.get(expanded_atom.cp) |
| 24 |
if pprovided and \ |
| 25 |
portage.match_from_list(expanded_atom, pprovided): |
| 26 |
@@ -3004,10 +3003,8 @@ |
| 27 |
if provider_virtual: |
| 28 |
atoms = [] |
| 29 |
for provider_entry in virtuals[blocker.cp]: |
| 30 |
- provider_cp = \ |
| 31 |
- portage.dep_getkey(provider_entry) |
| 32 |
atoms.append(Atom(blocker.atom.replace( |
| 33 |
- blocker.cp, provider_cp))) |
| 34 |
+ blocker.cp, provider_entry.cp, 1))) |
| 35 |
else: |
| 36 |
atoms = [blocker.atom] |
| 37 |
|
| 38 |
@@ -5352,14 +5349,14 @@ |
| 39 |
if len(expanded_atoms) > 1: |
| 40 |
non_virtual_atoms = [] |
| 41 |
for x in expanded_atoms: |
| 42 |
- if not portage.dep_getkey(x).startswith("virtual/"): |
| 43 |
+ if not x.cp.startswith("virtual/"): |
| 44 |
non_virtual_atoms.append(x) |
| 45 |
if len(non_virtual_atoms) == 1: |
| 46 |
expanded_atoms = non_virtual_atoms |
| 47 |
if len(expanded_atoms) > 1: |
| 48 |
# compatible with portage.cpv_expand() |
| 49 |
raise portage.exception.AmbiguousPackageName( |
| 50 |
- [portage.dep_getkey(x) for x in expanded_atoms]) |
| 51 |
+ [x.cp for x in expanded_atoms]) |
| 52 |
if expanded_atoms: |
| 53 |
atom = expanded_atoms[0] |
| 54 |
else: |
| 55 |
|
| 56 |
Modified: main/trunk/pym/portage/__init__.py |
| 57 |
=================================================================== |
| 58 |
--- main/trunk/pym/portage/__init__.py 2010-02-19 21:26:58 UTC (rev 15400) |
| 59 |
+++ main/trunk/pym/portage/__init__.py 2010-02-19 21:54:54 UTC (rev 15401) |
| 60 |
@@ -3276,7 +3276,10 @@ |
| 61 |
modified = False |
| 62 |
cp = dep.Atom(cpv_getkey(mycpv)) |
| 63 |
for virt in virts: |
| 64 |
- virt = dep_getkey(virt) |
| 65 |
+ try: |
| 66 |
+ virt = dep.Atom(virt).cp |
| 67 |
+ except exception.InvalidAtom: |
| 68 |
+ continue |
| 69 |
providers = self.virtuals.get(virt) |
| 70 |
if providers and cp in providers: |
| 71 |
continue |
| 72 |
@@ -8532,7 +8535,7 @@ |
| 73 |
# it may be necessary to remove the operator and |
| 74 |
# version from the atom before it is passed into |
| 75 |
# dbapi.cp_list(). |
| 76 |
- if mydb.cp_list(dep_getkey(vkey), use_cache=use_cache): |
| 77 |
+ if mydb.cp_list(vkey.cp): |
| 78 |
mykey = str(vkey) |
| 79 |
writemsg(_("virts chosen: %s\n") % (mykey), 1) |
| 80 |
break |
Archives