From 629ac21f7cfc1a8345099f7b6ef301db4129e318 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 3 Aug 2007 19:27:13 +0000 Subject: [PATCH] vimdiff against trunk svn path=/main/branches/prefix/; revision=7552 --- pym/portage/cache/util.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py index 99bf5e82a..4491946ca 100644 --- a/pym/portage/cache/util.py +++ b/pym/portage/cache/util.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: util.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id: $ from itertools import chain from portage.cache import cache_errors @@ -56,7 +56,13 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, break 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") -- 2.26.2