1 |
Author: zmedico |
2 |
Date: 2008-04-30 09:00:46 +0000 (Wed, 30 Apr 2008) |
3 |
New Revision: 10046 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/emerge |
7 |
Log: |
8 |
Handle a KeyError when validating the blocker cache. (trunk r10045) |
9 |
|
10 |
|
11 |
Modified: main/branches/2.1.2/bin/emerge |
12 |
=================================================================== |
13 |
--- main/branches/2.1.2/bin/emerge 2008-04-30 09:00:24 UTC (rev 10045) |
14 |
+++ main/branches/2.1.2/bin/emerge 2008-04-30 09:00:46 UTC (rev 10046) |
15 |
@@ -1546,7 +1546,12 @@ |
16 |
invalid_cache.add(cpv) |
17 |
continue |
18 |
counter, atoms = value |
19 |
- if counter != long(self._vardb.aux_get(cpv, ["COUNTER"])[0]): |
20 |
+ try: |
21 |
+ if counter != long(self._vardb.aux_get(cpv, ["COUNTER"])[0]): |
22 |
+ invalid_cache.add(cpv) |
23 |
+ continue |
24 |
+ except KeyError: |
25 |
+ # The package is no longer installed. |
26 |
invalid_cache.add(cpv) |
27 |
continue |
28 |
for cpv in invalid_cache: |
29 |
|
30 |
-- |
31 |
gentoo-commits@l.g.o mailing list |