[gentoo-commits] portage r14242 - in main/trunk/pym: _emerge portage

[gentoo-commits] portage r14242 - in main/trunk/pym: _emerge portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-09-13 00:07:50 +0000 (Sun, 13 Sep 2009)
New Revision: 14242

Modified:
   main/trunk/pym/_emerge/FakeVartree.py
   main/trunk/pym/portage/__init__.py
Log:
Use cpv_getkey() instead of dep_getkey() where appropriate.


Modified: main/trunk/pym/_emerge/FakeVartree.py
===================================================================
--- main/trunk/pym/_emerge/FakeVartree.py	2009-09-13 00:01:18 UTC (rev 14241)
+++ main/trunk/pym/_emerge/FakeVartree.py	2009-09-13 00:07:50 UTC (rev 14242)
@@ -52,7 +52,7 @@
 				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"])

Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2009-09-13 00:01:18 UTC (rev 14241)
+++ main/trunk/pym/portage/__init__.py	2009-09-13 00:07:50 UTC (rev 14242)
@@ -2082,7 +2082,7 @@
 				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 @@
 		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 @@
 		# 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: