From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 8 Jan 2007 16:20:31 +0000 (-0000)
Subject: For bug #160893, ignore a KeyError during cache cleansing since that key isn't wanted... 
X-Git-Tag: v2.1.2~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d7436de8bb1e57926e62fd9252bd599d52cd27b;p=portage.git

For bug #160893, ignore a KeyError during cache cleansing since that key isn't wanted anyway.

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

diff --git a/pym/cache/util.py b/pym/cache/util.py
index 2bfaa76fb..6393deef5 100644
--- a/pym/cache/util.py
+++ b/pym/cache/util.py
@@ -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