From 5b53671f270f5ee7edf2acc5a4529c7433fdfc92 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 11 Sep 2012 10:37:22 +0100 Subject: bitbake: lib/bb/event: improve handling of event queue on exit If BitBake exits before a UI handler (server) has been registered, we print the event queue; if there are any errors or other non-debug messages just print these and suppress the rest of the message queue. This improves the output when sanity check failures occur with OE-Core by avoiding printing a long stream of uninformative debug messages. (Bitbake rev: 8668a94cb1841798636b68fe123400d6b81f6574) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/event.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index fa179d8a11..ab62d4d055 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py @@ -104,6 +104,18 @@ def print_ui_queue(): console = logging.StreamHandler(sys.stdout) console.setFormatter(BBLogFormatter("%(levelname)s: %(message)s")) logger.handlers = [console] + + # First check to see if we have any proper messages + msgprint = False + for event in ui_queue: + if isinstance(event, logging.LogRecord): + if event.levelno > logging.DEBUG: + logger.handle(event) + msgprint = True + if msgprint: + return + + # Nope, so just print all of the messages we have (including debug messages) for event in ui_queue: if isinstance(event, logging.LogRecord): logger.handle(event) -- cgit v1.2.3-54-g00ecf