From 4437754142f6d0e8f3cf9ffbb51c61321b8c5600 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 15 Sep 2021 10:31:56 +0100 Subject: bitbake: bitbake-worker: Improve error handling If bitbake-worker fails, return an error code showing that. Also make the thread cleanup code explict in a finally clause as it would otherwise hang. [YOCTO #14393] (Bitbake rev: 7e0af70fb53fb13f824ca954b8cc1dffee730233) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-worker | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 7d982f90ba..3ca8c1853b 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker @@ -513,9 +513,11 @@ except BaseException as e: import traceback sys.stderr.write(traceback.format_exc()) sys.stderr.write(str(e)) - -worker_thread_exit = True -worker_thread.join() +finally: + worker_thread_exit = True + worker_thread.join() workerlog_write("exiting") +if not normalexit: + sys.exit(1) sys.exit(0) -- cgit v1.2.3-54-g00ecf