For bug #160893, ignore a KeyError during cache cleansing since that key isn't wanted...
authorZac Medico <zmedico@gentoo.org>
Mon, 8 Jan 2007 16:20:31 +0000 (16:20 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 8 Jan 2007 16:20:31 +0000 (16:20 -0000)
svn path=/main/trunk/; revision=5483

pym/cache/util.py

index 2bfaa76fb151c640696b937dc0c61fe97cd0f84b..6393deef536cb0880294f1393f6d1e925578cc73 100644 (file)
@@ -96,7 +96,10 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None,
        # ok.  by this time, the trg_cache is up to date, and we have a dict
        # with a crapload of cpv's.  we now walk the target db, removing stuff if it's in the list.
        for key in dead_nodes:
-               try:    del trg_cache[key]
+               try:
+                       del trg_cache[key]
+               except KeyError:
+                       pass
                except cache_errors.CacheError, ce:
                        noise.exception(ce)
                        del ce