diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 16:55:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 16:55:18 +0000 |
| commit | efb47ddf161e122101dc2ce3ab032db347b4d243 (patch) | |
| tree | f33d6364a011128629b7a2184dfbae09d5dda0b3 /pym/portage | |
| parent | 1b2c09ae90370fb766afe527d03a641703e9bce1 (diff) | |
| download | portage-efb47ddf161e122101dc2ce3ab032db347b4d243.tar.gz portage-efb47ddf161e122101dc2ce3ab032db347b4d243.tar.bz2 portage-efb47ddf161e122101dc2ce3ab032db347b4d243.zip | |
Handle a potential InvalidData exception in vardbapi.cp_all().
svn path=/main/trunk/; revision=10202
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 8 |
1 files changed, 6 insertions, 2 deletions
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 |