Add another sanity check in the owners cache. (trunk r10640)

svn path=/main/branches/2.1.2/; revision=10641

diff --git a/pym/portage.py b/pym/portage.py
index a24f471e73315b1b601fb4ac891379f6b1510af1..3bef63963193c796b2026151c097437b0cb049d8 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7402,7 +7402,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.