[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7104/8267] bitbake: Revert "tinfoil: fix duplication of log messages"

[Emmanuele Bassi <ebassi src gnome org>]

commit 46e22516252d03aeb8cbc4dedec58309ed9e8954
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon Aug 7 11:59:33 2017 +0200

    bitbake: Revert "tinfoil: fix duplication of log messages"
    
    In combination with the recent server reworking, this change actually
    prevents messages sent from tasks from being logged properly. This will
    of course give us the duplicated messages back, and I really hate to do
    that effectively a second time, but that's better than seeing no error
    at all in the case of a failure - we'll have to find the proper way of
    avoiding the duplication that doesn't result in some messages going
    missing.
    
    This reverts commit 8a5bae76f91f2411187c638a42fa3c762052cf11.
    
    (Bitbake rev: 645c8dd15762516ae5ab64a1df47fadb95d072d1)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/main.py    |    4 ++--
 bitbake/lib/bb/tinfoil.py |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 431f6f4..c51c6f2 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -394,10 +394,10 @@ def bitbake_main(configParams, configuration):
 
     return 1
 
-def setup_bitbake(configParams, configuration, extrafeatures=None, setup_logging=True):
+def setup_bitbake(configParams, configuration, extrafeatures=None):
     # Ensure logging messages get sent to the UI as events
     handler = bb.event.LogHandler()
-    if setup_logging and not configParams.status_only:
+    if not configParams.status_only:
         # In status only mode there are no logs and no UI
         logger.addHandler(handler)
 
diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py
index e246b3d..cd0587e 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -383,8 +383,7 @@ class Tinfoil:
 
         self.server_connection, ui_module = setup_bitbake(config_params,
                             cookerconfig,
-                            extrafeatures,
-                            setup_logging=False)
+                            extrafeatures)
 
         self.ui_module = ui_module