summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-09-16 13:05:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 22:17:57 +0100
commit5503ed14edea96b724ba54c29d87da8a25245d00 (patch)
tree900d67ca4ca786a5e3e72049a505e95b9a7e36ce /bitbake/lib/bb
parent792c40cbdd6ec6995e2e9b69056f4ea3986195eb (diff)
downloadpoky-5503ed14edea96b724ba54c29d87da8a25245d00.tar.gz
bitbake: bb.build: in _exec_task, catch BBHandledException
We don't want a traceback for this exception, we need to catch it, fire TaskFailed, and return failure. (Bitbake rev: 63966ada459d44d3dc7817ad2a026a22e8f6700f) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/build.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index fcf0149178..2ed0441b49 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -575,6 +575,9 @@ def _exec_task(fn, task, d, quieterr):
575 logger.error(str(exc)) 575 logger.error(str(exc))
576 event.fire(TaskFailed(task, logfn, localdata, errprinted), localdata) 576 event.fire(TaskFailed(task, logfn, localdata, errprinted), localdata)
577 return 1 577 return 1
578 except bb.BBHandledException:
579 event.fire(TaskFailed(task, logfn, localdata, True), localdata)
580 return 1
578 finally: 581 finally:
579 sys.stdout.flush() 582 sys.stdout.flush()
580 sys.stderr.flush() 583 sys.stderr.flush()