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 1R7XtN-00078Y-52 for garchives@archives.gentoo.org; Sat, 24 Sep 2011 19:28:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 023F521C087; Sat, 24 Sep 2011 19:27:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B272021C087 for ; Sat, 24 Sep 2011 19:27:56 +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 1CF071B4008 for ; Sat, 24 Sep 2011 19:27:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6C44880042 for ; Sat, 24 Sep 2011 19:27:55 +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: <13729a95fe68a51a0a18194a913fee4d3c17d160.zmedico@gentoo> 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: 13729a95fe68a51a0a18194a913fee4d3c17d160 Date: Sat, 24 Sep 2011 19:27:55 +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: 888b16d71b930b1032de9ae1f0c4cd66 commit: 13729a95fe68a51a0a18194a913fee4d3c17d160 Author: Zac Medico gentoo org> AuthorDate: Sat Sep 24 19:27:39 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 24 19:27:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D13729a95 portdbapi: split _visible from _iter_visible --- pym/portage/dbapi/porttree.py | 68 +++++++++++++++++++++--------------= ------ 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.p= y index aaa69fa..0967714 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -1026,10 +1026,6 @@ class portdbapi(dbapi): """ aux_keys =3D list(self._aux_cache_keys) metadata =3D {} - local_config =3D self.settings.local_config - chost =3D self.settings.get('CHOST', '') - accept_chost =3D self.settings._accept_chost - getMaskAtom =3D self.settings._getMaskAtom =20 if len(self.porttrees) =3D=3D 1: repos =3D [None] @@ -1056,41 +1052,47 @@ class portdbapi(dbapi): writemsg("!!! %s\n" % (e,), noiselevel=3D-1) del e continue - eapi =3D metadata["EAPI"] - if not eapi_is_supported(eapi): - continue - if _eapi_is_deprecated(eapi): - continue - if not metadata["SLOT"]: - continue - if getMaskAtom(mycpv, metadata): - continue - if self.settings._getMissingKeywords(mycpv, metadata): + + if not self._visible(mycpv, metadata): continue - if local_config: - metadata['CHOST'] =3D chost - if not accept_chost(mycpv, metadata): - continue - metadata["USE"] =3D "" - if "?" in metadata["LICENSE"] or \ - "?" in metadata["PROPERTIES"]: - self.doebuild_settings.setcpv(mycpv, mydb=3Dmetadata) - metadata['USE'] =3D \ - self.doebuild_settings['PORTAGE_USE'] - try: - if self.settings._getMissingLicenses( - mycpv, metadata): - continue - if self.settings._getMissingProperties( - mycpv, metadata): - continue - except InvalidDependString: - continue =20 yield mycpv # only yield a given cpv once break =20 + def _visible(self, cpv, metadata): + eapi =3D metadata["EAPI"] + if not eapi_is_supported(eapi): + return False + if _eapi_is_deprecated(eapi): + return False + if not metadata["SLOT"]: + return False + + settings =3D self.settings + if settings._getMaskAtom(cpv, metadata): + return False + if settings._getMissingKeywords(cpv, metadata): + return False + if settings.local_config: + metadata['CHOST'] =3D settings.get('CHOST', '') + if not settings._accept_chost(cpv, metadata): + return False + metadata["USE"] =3D "" + if "?" in metadata["LICENSE"] or \ + "?" in metadata["PROPERTIES"]: + self.doebuild_settings.setcpv(cpv, mydb=3Dmetadata) + metadata['USE'] =3D self.doebuild_settings['PORTAGE_USE'] + try: + if settings._getMissingLicenses(cpv, metadata): + return False + if settings._getMissingProperties(cpv, metadata): + return False + except InvalidDependString: + return False + + return True + def close_portdbapi_caches(): for i in portdbapi.portdbapi_instances: i.close_caches()