From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:35:04 +0000 (-0000)
Subject: Fix deprecated dep_getkey usage in match_from_list. (trunk r15381)
X-Git-Tag: v2.1.8~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f65907b6360d4d23ff34eada899e0cea58e42f1;p=portage.git

Fix deprecated dep_getkey usage in match_from_list. (trunk r15381)

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 47da7cedb..80b97c763 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -1056,7 +1056,9 @@ def match_from_list(mydep, candidate_list):
 		for x in candidate_list:
 			cp = getattr(x, "cp", None)
 			if cp is None:
-				cp = dep_getkey(x)
+				mysplit = catpkgsplit(remove_slot(x))
+				if mysplit is not None:
+					cp = mysplit[0] + '/' + mysplit[1]
 			if cp != mycpv:
 				continue
 			mylist.append(x)