PackageVirtualDbapi: fix get() for reposyntax

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index b83dd654b11097f6f13e47d0a35fbbf0210ed1c2..a886353f16b5d91bd0a70b02e9069fadac7c4566 100644 (file)
--- 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 3728f2ae3b3d4be9e65877bfdc3387266d81fe52..44c4313d1602034686e3d1088b37b146e7630fcb 100644 (file)
--- 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 \