From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R7YF7-0001T1-LL for garchives@archives.gentoo.org; Sat, 24 Sep 2011 19:50:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC41021C045; Sat, 24 Sep 2011 19:50:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AF3E821C045 for ; Sat, 24 Sep 2011 19:50:21 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A73D1B4002 for ; Sat, 24 Sep 2011 19:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 691C780042 for ; Sat, 24 Sep 2011 19:50:20 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/porttree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d3ad44b102f44aecdc0dc6ef951e853a9dd8dbbe Date: Sat, 24 Sep 2011 19:50:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 05413112bfd277b8ac738592763d94f1 commit: d3ad44b102f44aecdc0dc6ef951e853a9dd8dbbe Author: Zac Medico gentoo org> AuthorDate: Sat Sep 24 19:50:06 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 24 19:50:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd3ad44b1 portdbapi.xmatch: use _visible more --- pym/portage/dbapi/porttree.py | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.p= y index 0967714..d3cca00 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -911,8 +911,6 @@ class portdbapi(dbapi): mylist =3D match_from_list(mydep, self.cp_list(mykey, mytree=3Dmytree)) myval =3D "" - settings =3D self.settings - local_config =3D settings.local_config aux_keys =3D list(self._aux_cache_keys) if level =3D=3D "minimum-visible": iterfunc =3D iter @@ -936,29 +934,14 @@ class portdbapi(dbapi): except KeyError: # ebuild not in this repo, or masked by corruption continue - if not eapi_is_supported(metadata["EAPI"]): + + if not self._visible(cpv, metadata): continue + if mydep.slot is not None and \ mydep.slot !=3D metadata["SLOT"]: continue - if settings._getMissingKeywords(cpv, metadata): - continue - if settings._getMaskAtom(cpv, metadata): - continue - if local_config: - metadata["USE"] =3D "" - if "?" in metadata["LICENSE"] or \ - "?" in metadata["PROPERTIES"]: - self.doebuild_settings.setcpv(cpv, mydb=3Dmetadata) - metadata["USE"] =3D \ - self.doebuild_settings.get("PORTAGE_USE", "") - try: - if settings._getMissingLicenses(cpv, metadata): - continue - if settings._getMissingProperties(cpv, metadata): - continue - except InvalidDependString: - continue + if mydep.use is not None: mydep_with_repo =3D mydep if repo is not None and mydep.repo is None: