diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-02-19 21:26:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-19 21:26:58 +0000 |
| commit | 648ec0e0d68748ff2904c2672fa5ef1008d33c98 (patch) | |
| tree | f234d924a7d17cb4c9fa2859b8e0920c2f5d8298 /pym | |
| parent | 73af911b614baa96418a648e1b5107d84b1a9bdf (diff) | |
| download | portage-648ec0e0d68748ff2904c2672fa5ef1008d33c98.tar.gz portage-648ec0e0d68748ff2904c2672fa5ef1008d33c98.tar.bz2 portage-648ec0e0d68748ff2904c2672fa5ef1008d33c98.zip | |
Use Atom.cp instead of dep_getkey.
svn path=/main/trunk/; revision=15400
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/sets/base.py | 9 |
1 files 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() |