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 1SM3Um-0001Tk-3B for garchives@archives.gentoo.org; Sun, 22 Apr 2012 20:35:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07293E0B37; Sun, 22 Apr 2012 20:34:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CFE83E0B37 for ; Sun, 22 Apr 2012 20:34:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 416081B4104 for ; Sun, 22 Apr 2012 20:34:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 034DDE5402 for ; Sun, 22 Apr 2012 20:34:31 +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: <1335126858.e4ac7ed0d47b68b95da7854881a29e40d77f6e2f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/virtual.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e4ac7ed0d47b68b95da7854881a29e40d77f6e2f X-VCS-Branch: master Date: Sun, 22 Apr 2012 20:34:31 +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: da81912d-68f7-429e-bde9-a8776675a98f X-Archives-Hash: 509823acede38990ba68f1fe1cdb33e3 commit: e4ac7ed0d47b68b95da7854881a29e40d77f6e2f Author: Zac Medico gentoo org> AuthorDate: Sun Apr 22 20:34:18 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 22 20:34:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De4ac7ed0 fakedbapi.cp_list: remove obsolete virtual code This should have been included in commit d30db49bcaecbdeb20f6d4e180979b60b6260f69. --- pym/portage/dbapi/virtual.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/virtual.py b/pym/portage/dbapi/virtual.py index 8a35d0c..84b6b93 100644 --- a/pym/portage/dbapi/virtual.py +++ b/pym/portage/dbapi/virtual.py @@ -49,8 +49,7 @@ class fakedbapi(dbapi): # match cache uses the result from dep_expand for the cache_key. cache_key =3D (mycp, mycp) cachelist =3D self._match_cache.get(cache_key) - # cp_list() doesn't expand old-style virtuals - if cachelist and cachelist[0].startswith(mycp): + if cachelist is not None: return cachelist[:] cpv_list =3D self.cpdict.get(mycp) if cpv_list is None: