Merged from trunk -r15380:15383

   | 15381   | Fix deprecated dep_getkey usage in match_from_list.          |
   | zmedico |                                                              |

   | 15382   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15383   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=15389

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 9ff9b47aeb82293c33473cf1c89a5955bdb20720..89fdbe48c263c6b9b8375940918b894a1ab18fc9 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4408,9 +4408,7 @@ class depgraph(object):
                                        # assign index for a previous version in the same slot
                                        has_previous = False
                                        repo_name_prev = None
-                                       slot_atom = "%s:%s" % (portage.dep_getkey(pkg_key),
-                                               metadata["SLOT"])
-                                       slot_matches = vardb.match(slot_atom)
+                                       slot_matches = vardb.match(pkg.slot_atom)
                                        if slot_matches:
                                                has_previous = True
                                                repo_name_prev = vardb.aux_get(slot_matches[0],

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5d4ffc9675a033b5cfa48771b5bbcb478de1e0b0..ceb9eaba8591d30cbbb3de4b3cb666f3a7259dbe 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2648,7 +2648,7 @@ class config(object):
                has_changed = False
                self.mycpv = mycpv
                cat, pf = catsplit(mycpv)
-               cp = dep_getkey(mycpv)
+               cp = cpv_getkey(mycpv)
                cpv_slot = self.mycpv
                pkginternaluse = ""
                iuse = ""
@@ -3093,7 +3093,7 @@ class config(object):
                @return: A list of licenses that have not been accepted.
                """
                accept_license = self._accept_license
-               cpdict = self._plicensedict.get(dep_getkey(cpv), None)
+               cpdict = self._plicensedict.get(cpv_getkey(cpv), None)
                if cpdict:
                        accept_license = list(self._accept_license)
                        cpv_slot = "%s:%s" % (cpv, metadata["SLOT"])
@@ -3172,7 +3172,7 @@ class config(object):
                @return: A list of properties that have not been accepted.
                """
                accept_properties = self._accept_properties
-               cpdict = self._ppropertiesdict.get(dep_getkey(cpv), None)
+               cpdict = self._ppropertiesdict.get(cpv_getkey(cpv), None)
                if cpdict:
                        accept_properties = list(self._accept_properties)
                        cpv_slot = "%s:%s" % (cpv, metadata["SLOT"])

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)