diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-08-07 11:59:33 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-08 09:39:24 +0100 |
| commit | 645c8dd15762516ae5ab64a1df47fadb95d072d1 (patch) | |
| tree | d12db73ec9e086ebd39abb8223163dab87017e03 | |
| parent | 76c4f2c20216719736766e8ae7d089ccd061b71b (diff) | |
| download | bitbake-contrib-645c8dd15762516ae5ab64a1df47fadb95d072d1.tar.gz | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | lib/bb/main.py | 4 | ||||
| -rw-r--r-- | lib/bb/tinfoil.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py index 431f6f479..c51c6f2e4 100755 --- a/lib/bb/main.py +++ b/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/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index e246b3d2a..cd0587e27 100644 --- a/lib/bb/tinfoil.py +++ b/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 |