diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:37:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:37:55 +0000 |
| commit | b855427f21b002435b486327577d512cadd402d5 (patch) | |
| tree | aa0f506ff8007a5024690ce1510b0ca44b6289ec | |
| parent | 7160f8bef23aea86974bc90c945b2e144ea2075b (diff) | |
| download | portage-b855427f21b002435b486327577d512cadd402d5.tar.gz portage-b855427f21b002435b486327577d512cadd402d5.tar.bz2 portage-b855427f21b002435b486327577d512cadd402d5.zip | |
Remove redundant SLOT dep code in portdbapi.xmatch() since it's now
handled by dbapi._iter_match().
svn path=/main/trunk/; revision=10410
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 7fe361570..685fd18c5 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -607,7 +607,6 @@ class portdbapi(dbapi): 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 @@ 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 @@ -700,15 +699,7 @@ class portdbapi(dbapi): 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: |