| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 03:14:47 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11771 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/regenworld |
| 7 |
Log: |
| 8 |
Bug #241906 - Handle InvalidAtom exception raised from vardbapi.match(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/bin/regenworld |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/regenworld 2008-11-01 02:52:44 UTC (rev 11770) |
| 14 |
+++ main/trunk/bin/regenworld 2008-11-01 03:14:47 UTC (rev 11771) |
| 15 |
@@ -11,6 +11,7 @@ |
| 16 |
sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) |
| 17 |
import portage |
| 18 |
import re |
| 19 |
+import portage.exception |
| 20 |
|
| 21 |
__candidatematcher__ = re.compile("^[0-9]+: \\*\\*\\* emerge ") |
| 22 |
__noncandidatematcher__ = re.compile(" sync( |$)| clean( |$)| search( |$)|--oneshot|--fetchonly| unmerge( |$)") |
| 23 |
@@ -81,7 +82,7 @@ |
| 24 |
#print "checking:",mykey |
| 25 |
try: |
| 26 |
mylist=portage.db["/"]["vartree"].dbapi.match(mykey) |
| 27 |
- except KeyError: |
| 28 |
+ except (portage.exception.InvalidAtom, KeyError): |
| 29 |
if "--debug" in sys.argv: |
| 30 |
print "* ignoring broken log entry for %s (likely injected)" % mykey |
| 31 |
except ValueError, e: |
Archives