From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 11 Sep 2012 09:37:22 +0000 (+0100)
Subject: lib/bb/event: improve handling of event queue on exit
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8668a94cb1841798636b68fe123400d6b81f6574;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/event.py b/lib/bb/event.py
index fa179d8a11f..ab62d4d0555 100644
--- a/lib/bb/event.py
+++ b/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)