diff options
Diffstat (limited to 'bitbake/bin/bitbake-worker')
-rwxr-xr-x | bitbake/bin/bitbake-worker | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 97cc0fd60f..e3ce01eec8 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker | |||
@@ -413,9 +413,9 @@ class BitbakeWorker(object): | |||
413 | 413 | ||
414 | def handle_workerdata(self, data): | 414 | def handle_workerdata(self, data): |
415 | self.workerdata = pickle.loads(data) | 415 | self.workerdata = pickle.loads(data) |
416 | bb.build.verboseShellLogging = self.workerdata["build_verbose_shell"] | ||
417 | bb.build.verboseStdoutLogging = self.workerdata["build_verbose_stdout"] | ||
416 | bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] | 418 | bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] |
417 | bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] | ||
418 | bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] | ||
419 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] | 419 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] |
420 | for mc in self.databuilder.mcdata: | 420 | for mc in self.databuilder.mcdata: |
421 | self.databuilder.mcdata[mc].setVar("PRSERV_HOST", self.workerdata["prhost"]) | 421 | self.databuilder.mcdata[mc].setVar("PRSERV_HOST", self.workerdata["prhost"]) |
@@ -505,9 +505,11 @@ except BaseException as e: | |||
505 | import traceback | 505 | import traceback |
506 | sys.stderr.write(traceback.format_exc()) | 506 | sys.stderr.write(traceback.format_exc()) |
507 | sys.stderr.write(str(e)) | 507 | sys.stderr.write(str(e)) |
508 | finally: | ||
509 | worker_thread_exit = True | ||
510 | worker_thread.join() | ||
508 | 511 | ||
509 | worker_thread_exit = True | 512 | workerlog_write("exiting") |
510 | worker_thread.join() | 513 | if not normalexit: |
511 | 514 | sys.exit(1) | |
512 | workerlog_write("exitting") | ||
513 | sys.exit(0) | 515 | sys.exit(0) |