diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-30 09:00:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-30 09:00:46 +0000 |
| commit | 0e4df242655b30455be32116b2f114a3d20d286b (patch) | |
| tree | 6649b126379576c39e518d33f7969a2cab50dce3 | |
| parent | 8662c0dbe2e7d2f992173d071850bac3ad84ef91 (diff) | |
| download | portage-0e4df242655b30455be32116b2f114a3d20d286b.tar.gz portage-0e4df242655b30455be32116b2f114a3d20d286b.tar.bz2 portage-0e4df242655b30455be32116b2f114a3d20d286b.zip | |
Handle a KeyError when validating the blocker cache. (trunk r10045)
svn path=/main/branches/2.1.2/; revision=10046
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 6 insertions, 1 deletions
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: |