Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10203 - main/branches/2.1.2/pym
Date: Mon, 05 May 2008 16:55:50
Message-Id: E1Jt3yd-00057m-Ut@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-05 16:55:47 +0000 (Mon, 05 May 2008)
3 New Revision: 10203
4
5 Modified:
6 main/branches/2.1.2/pym/portage.py
7 Log:
8 Handle a potential InvalidData exception in vardbapi.cp_all(). (trunk r10202)
9
10
11 Modified: main/branches/2.1.2/pym/portage.py
12 ===================================================================
13 --- main/branches/2.1.2/pym/portage.py 2008-05-05 16:55:18 UTC (rev 10202)
14 +++ main/branches/2.1.2/pym/portage.py 2008-05-05 16:55:47 UTC (rev 10203)
15 @@ -6741,7 +6741,11 @@
16 for y in mylist:
17 if y[0] == '*':
18 y = y[1:]
19 - mysplit=catpkgsplit(y)
20 + try:
21 + mysplit = catpkgsplit(y)
22 + except portage_exception.InvalidData:
23 + self.invalidentry(self.root+VDB_PATH+"/"+y)
24 + continue
25 if not mysplit:
26 self.invalidentry(self.root+VDB_PATH+"/"+y)
27 continue
28
29 --
30 gentoo-commits@l.g.o mailing list