From 4b9de767f02d504c619582e0d62c9acd3230e76e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 3 Sep 2015 15:20:05 +0100 Subject: bitbake: event/server: Add _uiready flag to handle missing error messages If you start and suspend a bitbake execution so the bitbake lock is held, then try and run "bitbake -w '' X", you will see bitbake return an error exit code but print no message about what happened at all. The reason is that the -w option creates a "UI" which swallows the messages. The code which handles this exit failure mode thinks a UI has printed the messages and therefore doesn't do so. This adds in an extra parameter to the UI registration code so that we can figure out whether its a primary UI or not and base decisions on whether to display information on that instead. This fixes the error shown above and some bizarre failures on the Yocto Project Autobuilder. [YOCTO #8239] (Bitbake rev: d1d60a68c2de40c2984d5040d14251c1be121b0b) Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 2 +- bitbake/lib/bb/server/xmlrpc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 3198635e2f..f022b86c94 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -97,7 +97,7 @@ class ProcessServer(Process, BaseImplServer): def run(self): for event in bb.event.ui_queue: self.event_queue.put(event) - self.event_handle.value = bb.event.register_UIHhandler(self) + self.event_handle.value = bb.event.register_UIHhandler(self, True) bb.cooker.server_main(self.cooker, self.main) diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index f1a2067246..b7647c198f 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/lib/bb/server/xmlrpc.py @@ -99,7 +99,7 @@ class BitBakeServerCommands(): if (self.cooker.state in [bb.cooker.state.parsing, bb.cooker.state.running]): return None - self.event_handle = bb.event.register_UIHhandler(s) + self.event_handle = bb.event.register_UIHhandler(s, True) return self.event_handle def unregisterEventHandler(self, handlerNum): -- cgit v1.2.3-54-g00ecf