]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bb.build: in _exec_task, catch BBHandledException
authorChristopher Larson <chris_larson@mentor.com>
Fri, 16 Sep 2016 20:05:11 +0000 (13:05 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Sep 2016 21:17:52 +0000 (22:17 +0100)
We don't want a traceback for this exception, we need to catch it, fire
TaskFailed, and return failure.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/build.py

index fcf0149178542081922beeab0751aa5db302413a..2ed0441b4916f16f8485143b7a7d849e2763ab57 100644 (file)
@@ -575,6 +575,9 @@ def _exec_task(fn, task, d, quieterr):
             logger.error(str(exc))
             event.fire(TaskFailed(task, logfn, localdata, errprinted), localdata)
         return 1
+    except bb.BBHandledException:
+        event.fire(TaskFailed(task, logfn, localdata, True), localdata)
+        return 1
     finally:
         sys.stdout.flush()
         sys.stderr.flush()