Fix deprecated dep_getkey usage in match_from_list.
authorZac Medico <zmedico@gentoo.org>
Fri, 19 Feb 2010 10:03:11 +0000 (10:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 19 Feb 2010 10:03:11 +0000 (10:03 -0000)
svn path=/main/trunk/; revision=15381

pym/portage/dep.py

index 47da7cedb68093e79563cc0d356fa3d5ea84e8aa..80b97c7635c8309c5a0a1b51b0edcf4efa871467 100644 (file)
@@ -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)