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 7e5e1f771773093d0a14daadcf6dd247b9cc45ff..204b549b6130283a688ba2617fcfd4521e1ae4fb 100644 (file)
--- 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")