diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-13 00:07:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-13 00:07:50 +0000 |
| commit | 5cd73b5702d343072e7c0ed3a73de6e1951a77b1 (patch) | |
| tree | 86612fb8136f2dc24685645067b78f8f2ae1ff02 | |
| parent | 24c1a6237e40c43c76203858678e1d2e6897dc54 (diff) | |
| download | portage-5cd73b5702d343072e7c0ed3a73de6e1951a77b1.tar.gz portage-5cd73b5702d343072e7c0ed3a73de6e1951a77b1.tar.bz2 portage-5cd73b5702d343072e7c0ed3a73de6e1951a77b1.zip | |
Use cpv_getkey() instead of dep_getkey() where appropriate.
svn path=/main/trunk/; revision=14242
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index c4eec6d68..25bed2905 100644 --- 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 b3e44002a..c842f27e3 100644 --- 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: |