From 0e4df242655b30455be32116b2f114a3d20d286b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 30 Apr 2008 09:00:46 +0000
Subject: [PATCH] Handle a KeyError when validating the blocker cache. (trunk
 r10045)

svn path=/main/branches/2.1.2/; revision=10046
---
 bin/emerge | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/emerge b/bin/emerge
index 7ece9a8f5..d942750de 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1546,7 +1546,12 @@ class BlockerCache(DictMixin):
 					invalid_cache.add(cpv)
 					continue
 				counter, atoms = value
-				if counter != long(self._vardb.aux_get(cpv, ["COUNTER"])[0]):
+				try:
+					if counter != long(self._vardb.aux_get(cpv, ["COUNTER"])[0]):
+						invalid_cache.add(cpv)
+						continue
+				except KeyError:
+					# The package is no longer installed.
 					invalid_cache.add(cpv)
 					continue
 			for cpv in invalid_cache:
-- 
2.26.2