From 6bcf8e32dbf14b66091c8cc1fbf163ea2a1cd69d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2012 20:01:12 +0100 Subject: [PATCH] bitbake: utils.py: Try harder to extract good traceback information by querying the datastore Currently as soon as execution passes outside the code fragment being executed by better_exec, we don't get any good traceback information, just a likely obscure reference to some function name which may or may not be identifiable. This patch adds code to query the datastore if present, allowing a more meaningful back trace to be displayed in many cases. [YOCTO #2981] (Bitbake rev: 0edf8431f9ff52581afe0d3ef525c59909af02ba) Signed-off-by: Richard Purdie --- bitbake/lib/bb/utils.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 44a42a0..e0ef63c 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -218,7 +218,7 @@ def better_compile(text, file, realfile, mode = "exec"): raise -def better_exec(code, context, text = None, realfile = "", data = None): +def better_exec(code, context, text = None, realfile = ""): """ Similiar to better_compile, better_exec will print the lines that are responsible for the @@ -256,16 +256,25 @@ def better_exec(code, context, text = None, realfile = "", data = None): logger.error("The code that was being executed was:") _print_trace(textarray, linefailed) - logger.error("(file: '%s', lineno: %s, function: %s)", tbextract[0][0], tbextract[0][1], tbextract[0][2]) + logger.error("[From file: '%s', lineno: %s, function: %s]", tbextract[0][0], tbextract[0][1], tbextract[0][2]) # See if this is a function we constructed and has calls back into other functions in # "text". If so, try and improve the context of the error by diving down the trace level = 0 nexttb = tb.tb_next - while nexttb is not None: + while nexttb is not None and (level+1) < len(tbextract): if tbextract[level][0] == tbextract[level+1][0] and tbextract[level+1][2] == tbextract[level][0]: _print_trace(textarray, tbextract[level+1][1]) - logger.error("(file: '%s', lineno: %s, function: %s)", tbextract[level+1][0], tbextract[level+1][1], tbextract[level+1][2]) + logger.error("[From file: '%s', lineno: %s, function: %s]", tbextract[level+1][0], tbextract[level+1][1], tbextract[level+1][2]) + elif "d" in context and tbextract[level+1][2]: + d = context["d"] + functionname = tbextract[level+1][2] + text = d.getVar(functionname, True) + if text: + _print_trace(text.split('\n'), tbextract[level+1][1]) + logger.error("[From file: '%s', lineno: %s, function: %s]", tbextract[level+1][0], tbextract[level+1][1], tbextract[level+1][2]) + else: + break else: break nexttb = tb.tb_next -- 2.7.4