diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:40:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:40:43 +0000 |
| commit | 2bac0a336e693eb7f6aaee2ba540ab33c0414318 (patch) | |
| tree | 868490ff944e286d703781cacd67ca14e7b8aed0 /pym/portage.py | |
| parent | 19286824f424f5945790d6a58dd719531e0173bd (diff) | |
| download | portage-2bac0a336e693eb7f6aaee2ba540ab33c0414318.tar.gz portage-2bac0a336e693eb7f6aaee2ba540ab33c0414318.tar.bz2 portage-2bac0a336e693eb7f6aaee2ba540ab33c0414318.zip | |
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
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 14 |
1 files changed, 2 insertions, 12 deletions
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: |