summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-02 20:35:04 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-02 20:35:04 +0000
commit5f65907b6360d4d23ff34eada899e0cea58e42f1 (patch)
treed65d3ffa0ab2a9c9e2da34399fad2446482fa440
parent53e4843128571825ff9140248a5ac3e73ff760aa (diff)
downloadportage-5f65907b6360d4d23ff34eada899e0cea58e42f1.tar.gz
portage-5f65907b6360d4d23ff34eada899e0cea58e42f1.tar.bz2
portage-5f65907b6360d4d23ff34eada899e0cea58e42f1.zip
Fix deprecated dep_getkey usage in match_from_list. (trunk r15381)
svn path=/main/branches/2.1.7/; revision=15608
-rw-r--r--pym/portage/dep.py4
1 files changed, 3 insertions, 1 deletions
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)