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 1QKOP2-0003SV-JW for garchives@archives.gentoo.org; Thu, 12 May 2011 05:25:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B88161C095; Thu, 12 May 2011 05:24:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8B7BE1C095 for ; Thu, 12 May 2011 05:24:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 434B31B40A3 for ; Thu, 12 May 2011 05:24:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7974780062 for ; Thu, 12 May 2011 05:24:53 +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:2.1.9 commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e2e27248dd65af1c00514afefa19f63a5d78e9f6 Date: Thu, 12 May 2011 05:24:53 +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: c79d3248c9e97f77d68485af319e1643 commit: e2e27248dd65af1c00514afefa19f63a5d78e9f6 Author: Zac Medico gentoo org> AuthorDate: Wed May 11 04:03:02 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 12 05:21:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De2e27248 dep_check_composite_db: return early from cp_list Since this implementation is only intended to check for existence of new-style virtuals, it's a waste of time to return more than one cpv. --- pym/_emerge/depgraph.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 30085a5..344dcd9 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5667,7 +5667,9 @@ class _dep_check_composite_db(dbapi): def cp_list(self, cp): """ Emulate cp_list just so it can be used to check for existence - of new-style virtuals. + of new-style virtuals. Since it's a waste of time to return + more than one cpv for this use case, a maximum of one cpv will + be returned. """ if isinstance(cp, Atom): atom =3D cp @@ -5678,6 +5680,7 @@ class _dep_check_composite_db(dbapi): self._depgraph._frozen_config.roots[self._root], atom): if pkg.cp =3D=3D cp: ret.append(pkg.cpv) + break =20 return ret =20