From efb47ddf161e122101dc2ce3ab032db347b4d243 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 5 May 2008 16:55:18 +0000 Subject: Handle a potential InvalidData exception in vardbapi.cp_all(). svn path=/main/trunk/; revision=10202 --- pym/portage/dbapi/vartree.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b2cfeb9fe..b12a1993a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -9,7 +9,7 @@ from portage.data import portage_gid, portage_uid, secpass from portage.dbapi import dbapi from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \ isjustname, dep_getkey, match_from_list -from portage.exception import InvalidPackageName, InvalidAtom, \ +from portage.exception import InvalidAtom, InvalidData, InvalidPackageName, \ FileNotFound, PermissionDenied, UnsupportedAPIException from portage.locks import lockdir, unlockdir from portage.output import bold, red, green @@ -475,7 +475,11 @@ class vardbapi(dbapi): for y in mylist: if y[0] == '*': y = y[1:] - mysplit = catpkgsplit(y) + try: + mysplit = catpkgsplit(y) + except portage.exception.InvalidData: + self.invalidentry(self.getpath(y)) + continue if not mysplit: self.invalidentry(self.getpath(y)) continue -- cgit v1.2.3-1-g7c22