summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-13 07:16:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-13 11:28:27 +0000
commite67dfa4a4d0d63e4752655f25367582e5a95f1da (patch)
tree35af0dc38f713a559817e8b02b92084dc2f65032
parent970cd2fc4f0bbc93069dee5a15a608dd76081c67 (diff)
downloadbitbake-e67dfa4a4d0d63e4752655f25367582e5a95f1da.tar.gz
tinfoil: Update to match recent knotty console changes
This updates tinfoil to match recent changes to the logging code in knotty. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/tinfoil.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py
index 5c5be456e..a8e835d29 100644
--- a/lib/bb/tinfoil.py
+++ b/lib/bb/tinfoil.py
@@ -725,19 +725,9 @@ class Tinfoil:
# Borrowed from knotty, instead somewhat hackily we use the helper
# as the object to store "shutdown" on
helper = bb.ui.uihelper.BBUIHelper()
- # We set up logging optionally in the constructor so now we need to
- # grab the handlers to pass to TerminalFilter
- console = None
- errconsole = None
- for handler in self.logger.handlers:
- if isinstance(handler, logging.StreamHandler):
- if handler.stream == sys.stdout:
- console = handler
- elif handler.stream == sys.stderr:
- errconsole = handler
helper.shutdown = 0
parseprogress = None
- termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet)
+ termfilter = bb.ui.knotty.TerminalFilter(helper, helper, self.logger.handlers, quiet=self.quiet)
try:
while True:
try: