| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 21:26:58 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15400 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/sets/base.py |
| 7 |
Log: |
| 8 |
Use Atom.cp instead of dep_getkey. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/sets/base.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/sets/base.py 2010-02-19 21:16:11 UTC (rev 15399) |
| 14 |
+++ main/trunk/pym/portage/sets/base.py 2010-02-19 21:26:58 UTC (rev 15400) |
| 15 |
@@ -5,7 +5,7 @@ |
| 16 |
import sys |
| 17 |
from portage import cpv_getkey, flatten |
| 18 |
from portage.dep import Atom, isvalidatom, match_from_list, \ |
| 19 |
- best_match_to_list, dep_getkey, use_reduce, paren_reduce |
| 20 |
+ best_match_to_list, use_reduce, paren_reduce |
| 21 |
from portage.exception import InvalidAtom |
| 22 |
|
| 23 |
if sys.hexversion >= 0x3000000: |
| 24 |
@@ -153,7 +153,10 @@ |
| 25 |
return |
| 26 |
provides = provides.split() |
| 27 |
for provide in provides: |
| 28 |
- provided_cp = dep_getkey(provide) |
| 29 |
+ try: |
| 30 |
+ provided_cp = Atom(provide).cp |
| 31 |
+ except InvalidAtom: |
| 32 |
+ continue |
| 33 |
atoms = self._atommap.get(provided_cp) |
| 34 |
if atoms: |
| 35 |
for atom in atoms: |
| 36 |
@@ -201,7 +204,7 @@ |
| 37 |
def removePackageAtoms(self, cp): |
| 38 |
self._load() |
| 39 |
for a in list(self._atoms): |
| 40 |
- if dep_getkey(a) == cp: |
| 41 |
+ if a.cp == cp: |
| 42 |
self.remove(a) |
| 43 |
self.write() |
Archives