* [gentoo-commits] portage r10411 - main/branches/2.1.2/pym
@ 2008-05-25 4:40 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-25 4:40 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-05-25 04:40:43 +0000 (Sun, 25 May 2008)
New Revision: 10411
Modified:
main/branches/2.1.2/pym/portage.py
Log:
Remove redundant SLOT dep code in portdbapi.xmatch() since it's now
handled by dbapi._iter_match(). (trunk r10410)
Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py 2008-05-25 04:37:55 UTC (rev 10410)
+++ main/branches/2.1.2/pym/portage.py 2008-05-25 04:40:43 UTC (rev 10411)
@@ -7840,7 +7840,6 @@
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 @@
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 @@
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:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-25 4:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-25 4:40 [gentoo-commits] portage r10411 - main/branches/2.1.2/pym Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox