summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-10 05:31:48 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-10 05:31:48 +0000
commit148a587d0b6e1bea2ca7f798a13edacc756930ec (patch)
treec350093f61cf956d2d14d47912d2e3125e0a78f3
parenta29dd312ba6935871c9652efa317eef329e487de (diff)
downloadportage-148a587d0b6e1bea2ca7f798a13edacc756930ec.tar.gz
portage-148a587d0b6e1bea2ca7f798a13edacc756930ec.tar.bz2
portage-148a587d0b6e1bea2ca7f798a13edacc756930ec.zip
Add another sanity check in the owners cache.
svn path=/main/trunk/; revision=10640
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index f57555483..a624958c6 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -919,7 +919,10 @@ class vardbapi(dbapi):
base_names = self._vardb._aux_cache["owners"]["base_names"]
# Take inventory of all cached package hashes.
- for hash_values in base_names.itervalues():
+ for name, hash_values in base_names.items():
+ if not isinstance(hash_values, dict):
+ del base_names[name]
+ continue
cached_hashes.update(hash_values)
# Create sets of valid package hashes and uncached packages.