From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Jun 2008 05:31:48 +0000 (-0000)
Subject: Add another sanity check in the owners cache.
X-Git-Tag: v2.2_rc1~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=148a587d0b6e1bea2ca7f798a13edacc756930ec;p=portage.git

Add another sanity check in the owners cache.

svn path=/main/trunk/; revision=10640
---

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.