From 80cdcd1c53b411cab45b26485e156bf958eae16a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2012 20:02:39 +0100 Subject: [PATCH] bitbake: utils.py: Once we've printed errors messages, suppress the backtrace Adding a generic backtrace to better_compile and better_exec is pointless, therefore reraise the exception as a bb.BBHandledException so the generic code doesn't confuse the user even more. (Bitbake rev: b3d97130e1e70fe969399277dcd7cccd888103d6) Signed-off-by: Richard Purdie --- bitbake/lib/bb/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index e0ef63c..82dab6b 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -216,7 +216,8 @@ def better_compile(text, file, realfile, mode = "exec"): for line in body: logger.error(line) - raise + e = bb.BBHandledException(e) + raise e def better_exec(code, context, text = None, realfile = ""): """ @@ -231,7 +232,7 @@ def better_exec(code, context, text = None, realfile = ""): code = better_compile(code, realfile, realfile) try: exec(code, _context, context) - except Exception: + except Exception as e: (t, value, tb) = sys.exc_info() if t in [bb.parse.SkipPackage, bb.build.FuncFailed]: @@ -280,7 +281,8 @@ def better_exec(code, context, text = None, realfile = ""): nexttb = tb.tb_next level = level + 1 - raise + e = bb.BBHandledException(e) + raise e def simple_exec(code, context): exec(code, _context, context) -- 2.7.4