From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 May 2008 04:40:43 +0000 (-0000)
Subject: Remove redundant SLOT dep code in portdbapi.xmatch() since it's now
X-Git-Tag: v2.1.5.3~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bac0a336e693eb7f6aaee2ba540ab33c0414318;p=portage.git

Remove redundant SLOT dep code in portdbapi.xmatch() since it's now
handled by dbapi._iter_match(). (trunk r10410)

svn path=/main/branches/2.1.2/; revision=10411
---

diff --git a/pym/portage.py b/pym/portage.py
index cf38107df..768da9b14 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7840,7 +7840,6 @@ class portdbapi(dbapi):
 			mydep = dep_expand(origdep, mydb=self, settings=self.mysettings)
 			mykey=dep_getkey(mydep)
 
-		myslot = portage_dep.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))
@@ -7882,7 +7881,7 @@ class portdbapi(dbapi):
 					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
@@ -7916,16 +7915,7 @@ class portdbapi(dbapi):
 		else:
 			print "ERROR: xmatch doesn't handle",level,"query!"
 			raise KeyError
-		myslot = portage_dep.dep_getslot(mydep)
-		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: