summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-30 09:00:24 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-30 09:00:24 +0000
commit0010ee6416a0597e5e6b2e0bb57309a81e53f439 (patch)
tree130363c94ad6c95ca7e5c38e650e27a897c9b247
parent0ef85759cb1d028a71851069270bed9491231ba1 (diff)
downloadportage-0010ee6416a0597e5e6b2e0bb57309a81e53f439.tar.gz
portage-0010ee6416a0597e5e6b2e0bb57309a81e53f439.tar.bz2
portage-0010ee6416a0597e5e6b2e0bb57309a81e53f439.zip
Handle a KeyError when validating the blocker cache.
svn path=/main/trunk/; revision=10045
-rw-r--r--pym/_emerge/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ad9a05c86..06c034dd7 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1407,7 +1407,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: