| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 16:55:18 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10202 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Handle a potential InvalidData exception in vardbapi.cp_all(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-05-05 11:17:47 UTC (rev 10201) |
| 14 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-05-05 16:55:18 UTC (rev 10202) |
| 15 |
@@ -9,7 +9,7 @@ |
| 16 |
from portage.dbapi import dbapi |
| 17 |
from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \ |
| 18 |
isjustname, dep_getkey, match_from_list |
| 19 |
-from portage.exception import InvalidPackageName, InvalidAtom, \ |
| 20 |
+from portage.exception import InvalidAtom, InvalidData, InvalidPackageName, \ |
| 21 |
FileNotFound, PermissionDenied, UnsupportedAPIException |
| 22 |
from portage.locks import lockdir, unlockdir |
| 23 |
from portage.output import bold, red, green |
| 24 |
@@ -475,7 +475,11 @@ |
| 25 |
for y in mylist: |
| 26 |
if y[0] == '*': |
| 27 |
y = y[1:] |
| 28 |
- mysplit = catpkgsplit(y) |
| 29 |
+ try: |
| 30 |
+ mysplit = catpkgsplit(y) |
| 31 |
+ except portage.exception.InvalidData: |
| 32 |
+ self.invalidentry(self.getpath(y)) |
| 33 |
+ continue |
| 34 |
if not mysplit: |
| 35 |
self.invalidentry(self.getpath(y)) |
| 36 |
continue |
| 37 |
|
| 38 |
-- |
| 39 |
gentoo-commits@l.g.o mailing list |
Archives