From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 3 May 2006 19:02:34 +0000 (-0000)
Subject: Catch an uncaught CacheCorruption for the traceback from bug #126692.
X-Git-Tag: v2.1_rc1~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1153b15ff0cb00d54011782e929eb113f9ecb0d;p=portage.git

Catch an uncaught CacheCorruption for the traceback from bug #126692.

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

diff --git a/pym/cache/util.py b/pym/cache/util.py
index 7e5e1f771..204b549b6 100644
--- a/pym/cache/util.py
+++ b/pym/cache/util.py
@@ -41,7 +41,13 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None,
 			pass
 
 		if write_it:
-			if entry.get("INHERITED",""):
+			try:
+				inherited = entry.get("INHERITED", None)
+			except cache_errors.CacheError, ce:
+				noise.exception(x, ce)
+				del ce
+				continue
+			if inherited:
 				if src_cache.complete_eclass_entries:
 					if not "_eclasses_" in entry:
 						noise.corruption(x,"missing _eclasses_ field")