Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10045 - main/trunk/pym/_emerge
Date: Wed, 30 Apr 2008 09:00:29
Message-Id: E1Jr8Ar-00089J-MX@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-04-30 09:00:24 +0000 (Wed, 30 Apr 2008)
3 New Revision: 10045
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Handle a KeyError when validating the blocker cache.
9
10
11 Modified: main/trunk/pym/_emerge/__init__.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/__init__.py 2008-04-30 08:50:44 UTC (rev 10044)
14 +++ main/trunk/pym/_emerge/__init__.py 2008-04-30 09:00:24 UTC (rev 10045)
15 @@ -1407,7 +1407,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