diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-18 14:38:38 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-18 14:38:38 -0700 |
| commit | d0113119f50b5ccd54719279cf3faebfa9c2e5bc (patch) | |
| tree | ce1c20052469ca908afbeb9cfbfe7a98d7d8c460 | |
| parent | e8fc5d66e57a8a84214fec16610c6a44804e219a (diff) | |
| download | portage-d0113119f50b5ccd54719279cf3faebfa9c2e5bc.tar.gz portage-d0113119f50b5ccd54719279cf3faebfa9c2e5bc.tar.bz2 portage-d0113119f50b5ccd54719279cf3faebfa9c2e5bc.zip | |
PackageVirtualDbapi: fix get() for reposyntax
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 2 | ||||
| -rw-r--r-- | 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 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 \ |