| 1 |
Author: grobian |
| 2 |
Date: 2010-02-19 10:21:02 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15389 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/depgraph.py |
| 7 |
main/branches/prefix/pym/portage/__init__.py |
| 8 |
main/branches/prefix/pym/portage/dep.py |
| 9 |
Log: |
| 10 |
Merged from trunk -r15380:15383 |
| 11 |
|
| 12 |
| 15381 | Fix deprecated dep_getkey usage in match_from_list. | |
| 13 |
| zmedico | | |
| 14 |
|
| 15 |
| 15382 | Fix deprecated usage of dep_getkey. | |
| 16 |
| zmedico | | |
| 17 |
|
| 18 |
| 15383 | Fix deprecated usage of dep_getkey. | |
| 19 |
| zmedico | | |
| 20 |
|
| 21 |
|
| 22 |
Modified: main/branches/prefix/pym/_emerge/depgraph.py |
| 23 |
=================================================================== |
| 24 |
--- main/branches/prefix/pym/_emerge/depgraph.py 2010-02-19 10:20:22 UTC (rev 15388) |
| 25 |
+++ main/branches/prefix/pym/_emerge/depgraph.py 2010-02-19 10:21:02 UTC (rev 15389) |
| 26 |
@@ -4408,9 +4408,7 @@ |
| 27 |
# assign index for a previous version in the same slot |
| 28 |
has_previous = False |
| 29 |
repo_name_prev = None |
| 30 |
- slot_atom = "%s:%s" % (portage.dep_getkey(pkg_key), |
| 31 |
- metadata["SLOT"]) |
| 32 |
- slot_matches = vardb.match(slot_atom) |
| 33 |
+ slot_matches = vardb.match(pkg.slot_atom) |
| 34 |
if slot_matches: |
| 35 |
has_previous = True |
| 36 |
repo_name_prev = vardb.aux_get(slot_matches[0], |
| 37 |
|
| 38 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 39 |
=================================================================== |
| 40 |
--- main/branches/prefix/pym/portage/__init__.py 2010-02-19 10:20:22 UTC (rev 15388) |
| 41 |
+++ main/branches/prefix/pym/portage/__init__.py 2010-02-19 10:21:02 UTC (rev 15389) |
| 42 |
@@ -2648,7 +2648,7 @@ |
| 43 |
has_changed = False |
| 44 |
self.mycpv = mycpv |
| 45 |
cat, pf = catsplit(mycpv) |
| 46 |
- cp = dep_getkey(mycpv) |
| 47 |
+ cp = cpv_getkey(mycpv) |
| 48 |
cpv_slot = self.mycpv |
| 49 |
pkginternaluse = "" |
| 50 |
iuse = "" |
| 51 |
@@ -3093,7 +3093,7 @@ |
| 52 |
@return: A list of licenses that have not been accepted. |
| 53 |
""" |
| 54 |
accept_license = self._accept_license |
| 55 |
- cpdict = self._plicensedict.get(dep_getkey(cpv), None) |
| 56 |
+ cpdict = self._plicensedict.get(cpv_getkey(cpv), None) |
| 57 |
if cpdict: |
| 58 |
accept_license = list(self._accept_license) |
| 59 |
cpv_slot = "%s:%s" % (cpv, metadata["SLOT"]) |
| 60 |
@@ -3172,7 +3172,7 @@ |
| 61 |
@return: A list of properties that have not been accepted. |
| 62 |
""" |
| 63 |
accept_properties = self._accept_properties |
| 64 |
- cpdict = self._ppropertiesdict.get(dep_getkey(cpv), None) |
| 65 |
+ cpdict = self._ppropertiesdict.get(cpv_getkey(cpv), None) |
| 66 |
if cpdict: |
| 67 |
accept_properties = list(self._accept_properties) |
| 68 |
cpv_slot = "%s:%s" % (cpv, metadata["SLOT"]) |
| 69 |
|
| 70 |
Modified: main/branches/prefix/pym/portage/dep.py |
| 71 |
=================================================================== |
| 72 |
--- main/branches/prefix/pym/portage/dep.py 2010-02-19 10:20:22 UTC (rev 15388) |
| 73 |
+++ main/branches/prefix/pym/portage/dep.py 2010-02-19 10:21:02 UTC (rev 15389) |
| 74 |
@@ -1056,7 +1056,9 @@ |
| 75 |
for x in candidate_list: |
| 76 |
cp = getattr(x, "cp", None) |
| 77 |
if cp is None: |
| 78 |
- cp = dep_getkey(x) |
| 79 |
+ mysplit = catpkgsplit(remove_slot(x)) |
| 80 |
+ if mysplit is not None: |
| 81 |
+ cp = mysplit[0] + '/' + mysplit[1] |
| 82 |
if cp != mycpv: |
| 83 |
continue |
| 84 |
mylist.append(x) |
Archives