Bug #241906 - Handle InvalidAtom exception raised from vardbapi.match().

svn path=/main/trunk/; revision=11771

diff --git a/bin/regenworld b/bin/regenworld
index 52dbbe19c5c35109f707d01b08098350535cb880..11c6ea033c21cde9954411d8361b072dc6980274 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -11,6 +11,7 @@ except ImportError:
        sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
        import portage
 import re
+import portage.exception
 
 __candidatematcher__ = re.compile("^[0-9]+: \\*\\*\\* emerge ")
 __noncandidatematcher__ = re.compile(" sync( |$)| clean( |$)| search( |$)|--oneshot|--fetchonly| unmerge( |$)")
@@ -81,7 +82,7 @@ for mykey in biglist:
        #print "checking:",mykey
        try:
                mylist=portage.db["/"]["vartree"].dbapi.match(mykey)
-       except KeyError:
+       except (portage.exception.InvalidAtom, KeyError):
                if "--debug" in sys.argv:
                        print "* ignoring broken log entry for %s (likely injected)" % mykey
        except ValueError, e: