From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Jun 2008 05:34:55 +0000 (-0000)
Subject: Add another sanity check in the owners cache. (trunk r10640)
X-Git-Tag: v2.1.5.5~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1e0cc28c45119d66963525d64580a5d8cc5aaee;p=portage.git

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 a24f471e7..3bef63963 100644
--- 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.