summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-01 03:14:47 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-01 03:14:47 +0000
commita9fcc3f9c2e13294e87a649d780f16d09e77b447 (patch)
tree64530d2007d32f9995078ecaa160e443152cd6df
parent94ffb6983fac84f8dab53f1a025d593f6188e6d1 (diff)
downloadportage-a9fcc3f9c2e13294e87a649d780f16d09e77b447.tar.gz
portage-a9fcc3f9c2e13294e87a649d780f16d09e77b447.tar.bz2
portage-a9fcc3f9c2e13294e87a649d780f16d09e77b447.zip
Bug #241906 - Handle InvalidAtom exception raised from vardbapi.match().
svn path=/main/trunk/; revision=11771
-rwxr-xr-xbin/regenworld3
1 files changed, 2 insertions, 1 deletions
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: