Use cpv_getkey() instead of dep_getkey() where appropriate.

svn path=/main/trunk/; revision=14242

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index c4eec6d689b1d8eeafa267fb23760af3c4563959..25bed29056de91d2f1c1aedf3545df0526fd7c34 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -52,7 +52,7 @@ class FakeVartree(portage.vartree):
                                else:
                                        metadata = dict(izip(mykeys, real_dbapi.aux_get(cpv, mykeys)))
                                myslot = metadata["SLOT"]
-                               mycp = portage.dep_getkey(cpv)
+                               mycp = portage.cpv_getkey(cpv)
                                myslot_atom = "%s:%s" % (mycp, myslot)
                                try:
                                        mycounter = long(metadata["COUNTER"])

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b3e44002a0c216cecf862b022c7a45303994568d..c842f27e3e3efbcb65a471a32ac75a5af864d689 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2082,7 +2082,7 @@ class config(object):
                                cpv=catpkgsplit(x)
                                if not x:
                                        continue
-                               mycatpkg=dep_getkey(x)
+                               mycatpkg = cpv_getkey(x)
                                if mycatpkg in self.pprovideddict:
                                        self.pprovideddict[mycatpkg].append(x)
                                else:
@@ -2866,7 +2866,7 @@ class config(object):
                return None
 
        def _getKeywords(self, cpv, metadata):
-               cp = dep_getkey(cpv)
+               cp = cpv_getkey(cpv)
                pkg = "%s:%s" % (cpv, metadata["SLOT"])
                keywords = [[x for x in metadata["KEYWORDS"].split() if x != "-*"]]
                pos = len(keywords)
@@ -2909,7 +2909,7 @@ class config(object):
                # Repoman may modify this attribute as necessary.
                pgroups = self["ACCEPT_KEYWORDS"].split()
                match=0
-               cp = dep_getkey(cpv)
+               cp = cpv_getkey(cpv)
                pkgdict = self.pkeywordsdict.get(cp)
                matches = False
                if pkgdict: