From d0113119f50b5ccd54719279cf3faebfa9c2e5bc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Mar 2011 14:38:38 -0700 Subject: PackageVirtualDbapi: fix get() for reposyntax --- pym/_emerge/FakeVartree.py | 2 +- pym/_emerge/PackageVirtualDbapi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index b83dd654b..a886353f1 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -154,7 +154,7 @@ class FakeVartree(vartree): validation_keys = ["COUNTER", "_mtime_"] for cpv in current_cpv_set: - pkg_hash_key = ("installed", root, cpv, "nomerge") + pkg_hash_key = ("installed", root, cpv, "nomerge", "installed") pkg = pkg_vardb.get(pkg_hash_key) if pkg is not None: counter, mtime = real_vardb.aux_get(cpv, validation_keys) diff --git a/pym/_emerge/PackageVirtualDbapi.py b/pym/_emerge/PackageVirtualDbapi.py index 3728f2ae3..44c4313d1 100644 --- a/pym/_emerge/PackageVirtualDbapi.py +++ b/pym/_emerge/PackageVirtualDbapi.py @@ -56,9 +56,9 @@ class PackageVirtualDbapi(dbapi): def get(self, item, default=None): cpv = getattr(item, "cpv", None) if cpv is None: - if len(item) != 4: + if len(item) != 5: return default - type_name, root, cpv, operation = item + type_name, root, cpv, operation, repo_key = item existing = self._cpv_map.get(cpv) if existing is not None and \ -- cgit v1.2.3-1-g7c22