projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53e4843
)
Fix deprecated dep_getkey usage in match_from_list. (trunk r15381)
author
Zac Medico
<zmedico@gentoo.org>
Tue, 2 Mar 2010 20:35:04 +0000
(20:35 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Tue, 2 Mar 2010 20:35:04 +0000
(20:35 -0000)
svn path=/main/branches/2.1.7/; revision=15608
pym/portage/dep.py
patch
|
blob
|
history
diff --git
a/pym/portage/dep.py
b/pym/portage/dep.py
index 47da7cedb68093e79563cc0d356fa3d5ea84e8aa..80b97c7635c8309c5a0a1b51b0edcf4efa871467 100644
(file)
--- 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)