Use Atom.cp instead of dep_getkey. (trunk r15399)
authorZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:43:32 +0000 (20:43 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:43:32 +0000 (20:43 -0000)
svn path=/main/branches/2.1.7/; revision=15621

pym/portage/_sets/files.py

index 29cb1dde033110280259aa5717b3bdf64bb20f30..48f00d04e73f6e06c52366b6efe505a7ae41332c 100644 (file)
@@ -19,7 +19,7 @@ from portage._sets.base import PackageSet, EditablePackageSet
 from portage._sets import SetConfigError, SETPREFIX, get_boolean
 from portage.env.loaders import ItemFileLoader, KeyListFileLoader
 from portage.env.validators import ValidAtomValidator
-from portage import dep_getkey, cpv_getkey
+from portage import cpv_getkey
 
 __all__ = ["WorldSelectedSet",]
 
@@ -96,7 +96,7 @@ class WorldSelectedSet(EditablePackageSet):
                mykey = cpv_getkey(cpv)
                newworldlist = []
                for x in worldlist:
-                       if dep_getkey(x) == mykey:
+                       if x.cp == mykey:
                                matches = vardb.match(x, use_cache=0)
                                if not matches:
                                        #zap our world entry