From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:43:32 +0000 (-0000)
Subject: Use Atom.cp instead of dep_getkey. (trunk r15399)
X-Git-Tag: v2.1.8~101
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91311f73737ad6220b9e87e5b8d29db50a095060;p=portage.git

Use Atom.cp instead of dep_getkey. (trunk r15399)

svn path=/main/branches/2.1.7/; revision=15621
---

diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index 29cb1dde0..48f00d04e 100644
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -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