From 9dc2ed858560a6be7f638904920fc2474095808e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 20:45:14 +0000 Subject: [PATCH] Use Atom.cp instead of dep_getkey. (trunk r15400) svn path=/main/branches/2.1.7/; revision=15622 --- pym/portage/_sets/base.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/_sets/base.py b/pym/portage/_sets/base.py index 216c8cc16..0d88d0efb 100644 --- a/pym/portage/_sets/base.py +++ b/pym/portage/_sets/base.py @@ -5,7 +5,7 @@ import sys from portage import cpv_getkey, flatten from portage.dep import Atom, isvalidatom, match_from_list, \ - best_match_to_list, dep_getkey, use_reduce, paren_reduce + best_match_to_list, use_reduce, paren_reduce from portage.exception import InvalidAtom if sys.hexversion >= 0x3000000: @@ -153,7 +153,10 @@ class PackageSet(object): return provides = provides.split() for provide in provides: - provided_cp = dep_getkey(provide) + try: + provided_cp = Atom(provide).cp + except InvalidAtom: + continue atoms = self._atommap.get(provided_cp) if atoms: for atom in atoms: @@ -201,7 +204,7 @@ class EditablePackageSet(PackageSet): def removePackageAtoms(self, cp): self._load() for a in list(self._atoms): - if dep_getkey(a) == cp: + if a.cp == cp: self.remove(a) self.write() -- 2.26.2