From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Nov 2008 03:14:47 +0000 (-0000)
Subject: Bug #241906 - Handle InvalidAtom exception raised from vardbapi.match().
X-Git-Tag: v2.2_rc13~19
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a9fcc3f9c2e13294e87a649d780f16d09e77b447;p=portage.git

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

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

diff --git a/bin/regenworld b/bin/regenworld
index 52dbbe19c..11c6ea033 100755
--- 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: