From 35c59553800a76850fdeaa7d86d97aab8158c35f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 26 Dec 2012 20:42:17 +0100 Subject: [PATCH] [matter] properly catch portage.exception.InvalidAtom in _pre_graph_filters() --- matter/matter/builder.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/matter/matter/builder.py b/matter/matter/builder.py index 9135824a2..cc8e7fa80 100644 --- a/matter/matter/builder.py +++ b/matter/matter/builder.py @@ -46,6 +46,7 @@ from _emerge.Blocker import Blocker import portage.versions import portage.dep +import portage.exception import portage @@ -229,7 +230,12 @@ class PackageBuilder(object): allow_not_installed = self._params['not-installed'] == "yes" allow_downgrade = self._params['downgrade'] == "yes" - best_visible = portdb.xmatch("bestmatch-visible", package) + try: + best_visible = portdb.xmatch("bestmatch-visible", package) + except portage.exception.InvalidAtom: + print_error("cannot match: %s, invalid atom" % (package,)) + best_visible = None + if not best_visible: # package not found, return error print_error("cannot match: %s, ignoring this one" % (package,))