[gentoo-commits] portage r10410 - main/trunk/pym/portage/dbapi

[gentoo-commits] portage r10410 - main/trunk/pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-05-25 04:37:55 +0000 (Sun, 25 May 2008)
New Revision: 10410

Modified:
   main/trunk/pym/portage/dbapi/porttree.py
Log:
Remove redundant SLOT dep code in portdbapi.xmatch() since it's now
handled by dbapi._iter_match().


Modified: main/trunk/pym/portage/dbapi/porttree.py
===================================================================
--- main/trunk/pym/portage/dbapi/porttree.py	2008-05-25 04:23:16 UTC (rev 10409)
+++ main/trunk/pym/portage/dbapi/porttree.py	2008-05-25 04:37:55 UTC (rev 10410)
@@ -607,7 +607,6 @@
 			mydep = dep_expand(origdep, mydb=self, settings=self.mysettings)
 			mykey = dep_getkey(mydep)
 
-		myslot = dep_getslot(mydep)
 		if level == "list-visible":
 			#a list of all visible packages, not called directly (just by xmatch())
 			#myval = self.visible(self.cp_list(mykey))
@@ -650,7 +649,7 @@
 					continue
 				if not eapi_is_supported(metadata["EAPI"]):
 					continue
-				if myslot and myslot != metadata["SLOT"]:
+				if mydep.slot and mydep.slot != metadata["SLOT"]:
 					continue
 				if settings.getMissingKeywords(cpv, metadata):
 					continue
@@ -700,15 +699,7 @@
 		else:
 			print "ERROR: xmatch doesn't handle", level, "query!"
 			raise KeyError
-		if myslot is not None and isinstance(myval, list):
-			slotmatches = []
-			for cpv in myval:
-				try:
-					if self.aux_get(cpv, ["SLOT"])[0] == myslot:
-						slotmatches.append(cpv)
-				except KeyError:
-					pass # ebuild masked by corruption
-			myval = slotmatches
+
 		if self.frozen and (level not in ["match-list", "bestmatch-list"]):
 			self.xcache[level][mydep] = myval
 			if origdep and origdep != mydep:

-- 
gentoo-commits@lists.gentoo.org mailing list