diff options
| -rw-r--r-- | lib/bb/data_smart.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index e76fbbf6c..df9798ad5 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -90,6 +90,17 @@ class DataContext(dict): else: return value +class ExpansionError(Exception): + def __init__(self, varname, expression, exception): + self.expression = expression + self.variablename = varname + self.exception = exception + self.msg = "Failure expanding variable %s, expression was %s which triggered exception %s: %s" % (varname, expression, type(exception).__name__, exception) + Exception.__init__(self, self.msg) + self.args = (varname, expression, exception) + def __str__(self): + return self.msg + class DataSmart(MutableMapping): def __init__(self, special = COWDictBase.copy(), seen = COWDictBase.copy() ): self.dict = {} @@ -117,9 +128,10 @@ class DataSmart(MutableMapping): s = __expand_python_regexp__.sub(varparse.python_sub, s) if s == olds: break - except Exception: - logger.exception("Error evaluating '%s'", s) + except ExpansionError: raise + except Exception as exc: + raise ExpansionError(varname, s, exc) varparse.value = s |