summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-03 19:02:34 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-03 19:02:34 +0000
commitc1153b15ff0cb00d54011782e929eb113f9ecb0d (patch)
tree540a5206c69a1b84a43b2afd5c6eca48b9c93189
parentdbde5b5eb4d897ec4fd1b8ffaf75dadf393c852b (diff)
downloadportage-c1153b15ff0cb00d54011782e929eb113f9ecb0d.tar.gz
portage-c1153b15ff0cb00d54011782e929eb113f9ecb0d.tar.bz2
portage-c1153b15ff0cb00d54011782e929eb113f9ecb0d.zip
Catch an uncaught CacheCorruption for the traceback from bug #126692.
svn path=/main/trunk/; revision=3313
-rw-r--r--pym/cache/util.py8
1 files changed, 7 insertions, 1 deletions
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")