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 1Q0hNr-0007eO-Rj for garchives@archives.gentoo.org; Fri, 18 Mar 2011 21:39:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 764661C003; Fri, 18 Mar 2011 21:38:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2FC361C003 for ; Fri, 18 Mar 2011 21:38:52 +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 BB3C81B408C for ; Fri, 18 Mar 2011 21:38:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2A5148006A for ; Fri, 18 Mar 2011 21:38:51 +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/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/FakeVartree.py pym/_emerge/PackageVirtualDbapi.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d0113119f50b5ccd54719279cf3faebfa9c2e5bc Date: Fri, 18 Mar 2011 21:38:51 +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: aca976bb6c1268b25b60d3834107782e commit: d0113119f50b5ccd54719279cf3faebfa9c2e5bc Author: Zac Medico gentoo org> AuthorDate: Fri Mar 18 21:38:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Mar 18 21:38:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd0113119 PackageVirtualDbapi: fix get() for reposyntax --- pym/_emerge/FakeVartree.py | 2 +- pym/_emerge/PackageVirtualDbapi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index b83dd65..a886353 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -154,7 +154,7 @@ class FakeVartree(vartree): validation_keys =3D ["COUNTER", "_mtime_"] for cpv in current_cpv_set: =20 - pkg_hash_key =3D ("installed", root, cpv, "nomerge") + pkg_hash_key =3D ("installed", root, cpv, "nomerge", "installed") pkg =3D pkg_vardb.get(pkg_hash_key) if pkg is not None: counter, mtime =3D real_vardb.aux_get(cpv, validation_keys) diff --git a/pym/_emerge/PackageVirtualDbapi.py b/pym/_emerge/PackageVirt= ualDbapi.py index 3728f2a..44c4313 100644 --- a/pym/_emerge/PackageVirtualDbapi.py +++ b/pym/_emerge/PackageVirtualDbapi.py @@ -56,9 +56,9 @@ class PackageVirtualDbapi(dbapi): def get(self, item, default=3DNone): cpv =3D getattr(item, "cpv", None) if cpv is None: - if len(item) !=3D 4: + if len(item) !=3D 5: return default - type_name, root, cpv, operation =3D item + type_name, root, cpv, operation, repo_key =3D item =20 existing =3D self._cpv_map.get(cpv) if existing is not None and \