diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-14 23:09:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-15 16:48:12 +0000 |
commit | 8b217208cfa47c25d50f0775f4c37ebf39a3bd11 (patch) | |
tree | 34e10af1f2e25782b9f2ed53055f4bd83064408f /bitbake/lib/bb | |
parent | a9223e20d1c94d785af53e4b8c191d865bb0fa12 (diff) | |
download | poky-8b217208cfa47c25d50f0775f4c37ebf39a3bd11.tar.gz |
bitbake: knotty: Set exit failure code on runQueueTaskFailed events
If the worker segfaults, we may never see a TaskFailed event from it, only
a runQueueTaskFailed event. In this case, return_value isn't getting set
leading to an incorrect exit code from bitbake. Fix by setting return_value
in both places.
(Bitbake rev: e5dd50e0d95d532fe31dde61f8c6b1a7a72321e9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index a8b968ccea..a7521ee827 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -490,6 +490,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): | |||
490 | continue | 490 | continue |
491 | 491 | ||
492 | if isinstance(event, bb.runqueue.runQueueTaskFailed): | 492 | if isinstance(event, bb.runqueue.runQueueTaskFailed): |
493 | return_value = 1 | ||
493 | taskfailures.append(event.taskstring) | 494 | taskfailures.append(event.taskstring) |
494 | logger.error("Task %s (%s) failed with exit code '%s'", | 495 | logger.error("Task %s (%s) failed with exit code '%s'", |
495 | event.taskid, event.taskstring, event.exitcode) | 496 | event.taskid, event.taskstring, event.exitcode) |