From d73da22b0e332411ed5552d36910fe15f92c8fac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 30 Mar 2016 20:52:56 +0100 Subject: bitbake: build/utils: Allow python functions to execute with real exception handling With the code as it stands today it not possible to execute a python function and get "normal" python exception handling behaviour. If a python function raises an exception, it forces a traceback to be printed and the exception becomes a FuncFailed exception. This adds in a parameter 'pythonexception' which allows standard python exceptions to be passed unchanged with no traceback. Ultimately we may want to change to this convention in various places but at least it means we can start to add sane functions now. (Bitbake rev: 85cf22fd0ed26bb7dc7738ef2a10441891f38ae2) Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 15 +++++++++++---- bitbake/lib/bb/utils.py | 4 +++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index d20ee065b2..db5072cb4d 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -156,7 +156,12 @@ class LogTee(object): def flush(self): self.outfile.flush() -def exec_func(func, d, dirs = None): +# +# pythonexception allows the python exceptions generated to be raised +# as the real exceptions (not FuncFailed) and without a backtrace at the +# origin of the failure. +# +def exec_func(func, d, dirs = None, pythonexception=False): """Execute a BB 'function'""" body = d.getVar(func, False) @@ -224,7 +229,7 @@ def exec_func(func, d, dirs = None): with bb.utils.fileslocked(lockfiles): if ispython: - exec_func_python(func, d, runfile, cwd=adir) + exec_func_python(func, d, runfile, cwd=adir, pythonexception=pythonexception) else: exec_func_shell(func, d, runfile, cwd=adir) @@ -232,7 +237,7 @@ _functionfmt = """ {function}(d) """ logformatter = bb.msg.BBLogFormatter("%(levelname)s: %(message)s") -def exec_func_python(func, d, runfile, cwd=None): +def exec_func_python(func, d, runfile, cwd=None, pythonexception=False): """Execute a python BB 'function'""" code = _functionfmt.format(function=func) @@ -256,10 +261,12 @@ def exec_func_python(func, d, runfile, cwd=None): bb.methodpool.insert_method(func, text, fn, lineno - 1) comp = utils.better_compile(code, func, "exec_python_func() autogenerated") - utils.better_exec(comp, {"d": d}, code, "exec_python_func() autogenerated") + utils.better_exec(comp, {"d": d}, code, "exec_python_func() autogenerated", pythonexception=pythonexception) except (bb.parse.SkipRecipe, bb.build.FuncFailed): raise except: + if pythonexception: + raise raise FuncFailed(func, None) finally: bb.debug(2, "Python function %s finished" % func) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 7ab8927608..e9ad68f2d7 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -372,7 +372,7 @@ def _print_exception(t, value, tb, realfile, text, context): finally: logger.error("\n".join(error)) -def better_exec(code, context, text = None, realfile = ""): +def better_exec(code, context, text = None, realfile = "", pythonexception=False): """ Similiar to better_compile, better_exec will print the lines that are responsible for the @@ -389,6 +389,8 @@ def better_exec(code, context, text = None, realfile = ""): # Error already shown so passthrough, no need for traceback raise except Exception as e: + if pythonexception: + raise (t, value, tb) = sys.exc_info() try: _print_exception(t, value, tb, realfile, text, context) -- cgit v1.2.3-54-g00ecf