[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6637/8267] bitbake: knotty: Drop task prefix of PLAIN log messages

[Emmanuele Bassi <ebassi src gnome org>]

commit f88652d2843612b9844d61a595dd3f829452673e
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Jul 7 16:00:35 2017 +0100

    bitbake: knotty: Drop task prefix of PLAIN log messages
    
    To quote Paul:
    
    Not that long ago we added a prefix to logged messages to allow us to see
    where the message has been generated (recipe / task). This is undoubtedly
    useful for errors and warnings, however, I'm not sure it's really appropriate
    for bb.plain(). As an example, see the output for -c listtasks now:
    
    ...
    NOTE: Executing RunQueue Tasks
    nodejs-native-4.5.0-r0 do_listtasks: do_addto_recipe_sysroot
    nodejs-native-4.5.0-r0 do_listtasks: do_build                      Default task for a recipe - depends on 
all other normal tasks required to 'build' a recipe
    nodejs-native-4.5.0-r0 do_listtasks: do_checklicense
    nodejs-native-4.5.0-r0 do_listtasks: do_checklicenseall
    nodejs-native-4.5.0-r0 do_listtasks: do_checkpkg
    ...
    
    This patch excludes PLAIN messages from this prefixing making the log output
    neater.
    
    [YOCTO #11457]
    
    (Bitbake rev: 4a14b44b3e4fad3a3e5e53461aa8ba9929a515b8)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/ui/knotty.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index 936d5a4..11afb3e 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -472,7 +472,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
                         continue
 
                     # Prefix task messages with recipe/task
-                    if event.taskpid in helper.running_tasks:
+                    if event.taskpid in helper.running_tasks and event.levelno != format.PLAIN:
                         taskinfo = helper.running_tasks[event.taskpid]
                         event.msg = taskinfo['title'] + ': ' + event.msg
                 if hasattr(event, 'fn'):