From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 19 Feb 2010 21:26:58 +0000 (-0000)
Subject: Use Atom.cp instead of dep_getkey.
X-Git-Tag: v2.2_rc63~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=648ec0e0d68748ff2904c2672fa5ef1008d33c98;p=portage.git

Use Atom.cp instead of dep_getkey.

svn path=/main/trunk/; revision=15400
---

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()