| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 10:03:11 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15381 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dep.py |
| 7 |
Log: |
| 8 |
Fix deprecated dep_getkey usage in match_from_list. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/dep.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/dep.py 2010-02-19 09:43:36 UTC (rev 15380) |
| 14 |
+++ main/trunk/pym/portage/dep.py 2010-02-19 10:03:11 UTC (rev 15381) |
| 15 |
@@ -1056,7 +1056,9 @@ |
| 16 |
for x in candidate_list: |
| 17 |
cp = getattr(x, "cp", None) |
| 18 |
if cp is None: |
| 19 |
- cp = dep_getkey(x) |
| 20 |
+ mysplit = catpkgsplit(remove_slot(x)) |
| 21 |
+ if mysplit is not None: |
| 22 |
+ cp = mysplit[0] + '/' + mysplit[1] |
| 23 |
if cp != mycpv: |
| 24 |
continue |
| 25 |
mylist.append(x) |
Archives