From b5e3b28b7c982dd8a3991d727f25710dbf58bb80 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 31 Aug 2017 11:30:43 +1200 Subject: tinfoil: fix log message doubling when config_only=False With config_only=False we launch the UI and it sets up a logger, whereas when config_only=True we don't, with the result that with True we are seeing log messages from both our logger and the one set up by the UI. Suppress our loggers with config_only=True to avoid this. Fixes [YOCTO #11275] (again). Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index cd0587e27..fd17edcc5 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -325,7 +325,12 @@ class Tinfoil: if setup_logging: # This is the *client-side* logger, nothing to do with # logging messages from the server + oldhandlers = self.logger.handlers[:] bb.msg.logger_create('BitBake', output) + self.localhandlers = [] + for handler in self.logger.handlers: + if handler not in oldhandlers: + self.localhandlers.append(handler) def __enter__(self): return self @@ -381,6 +386,12 @@ class Tinfoil: cookerconfig = CookerConfiguration() cookerconfig.setConfigParameters(config_params) + if not config_only: + # Disable local loggers because the UI module is going to set up its own + for handler in self.localhandlers: + self.logger.handlers.remove(handler) + self.localhandlers = [] + self.server_connection, ui_module = setup_bitbake(config_params, cookerconfig, extrafeatures) -- cgit 1.2.3-korg