[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6998/8267] bitbake: event: Don't write duplicate logs to stdout and stderr in no UI case

[Emmanuele Bassi <ebassi src gnome org>]

commit 25e52d34d06f800b38824fc21799dc43b31093f2
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Jul 28 15:27:28 2017 +0100

    bitbake: event: Don't write duplicate logs to stdout and stderr in no UI case
    
    This code would duplicate messages to stdout and stderr when no UI connected
    and there were error level messages.
    
    Rework the code so it either uses stderr (for errors and above) or
    stdout for warnings/debug but not both for the same messages.
    
    (Bitbake rev: 45cff5734ba2ba8c8d36d17d722a5804d39b258b)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/event.py |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 3827dcf..526c41f 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -149,23 +149,30 @@ def print_ui_queue():
 
         # First check to see if we have any proper messages
         msgprint = False
+        msgerrs = False
+
+        # Should we print to stderr?
+        for event in ui_queue[:]:
+            if isinstance(event, logging.LogRecord) and event.levelno >= logging.WARNING:
+                msgerrs = True
+                break
+
+        if msgerrs:
+            logger.addHandler(stderr)
+        else:
+            logger.addHandler(stdout)
+
         for event in ui_queue[:]:
             if isinstance(event, logging.LogRecord):
                 if event.levelno > logging.DEBUG:
-                    if event.levelno >= logging.WARNING:
-                        logger.addHandler(stderr)
-                    else:
-                        logger.addHandler(stdout)
                     logger.handle(event)
                     msgprint = True
-        if msgprint:
-            return
 
         # Nope, so just print all of the messages we have (including debug messages)
-        logger.addHandler(stdout)
-        for event in ui_queue[:]:
-            if isinstance(event, logging.LogRecord):
-                logger.handle(event)
+        if not msgprint:
+            for event in ui_queue[:]:
+                if isinstance(event, logging.LogRecord):
+                    logger.handle(event)
 
 def fire_ui_handlers(event, d):
     global _thread_lock