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:29:23 +0000
commitca5b3b4d1cdeaf4ad58c84300a2e395d3c52bb51 (patch)
tree71e1956bc8a1dc514a9af6db0db86de51fa472ac
parentbf7d68c812e9807d88b529212487dda7fa60245a (diff)
downloadpoky-ca5b3b4d1cdeaf4ad58c84300a2e395d3c52bb51.tar.gz
bitbake: tinfoil: Update to match recent knotty console changes
This updates tinfoil to match recent changes to the logging code in knotty. (Bitbake rev: e67dfa4a4d0d63e4752655f25367582e5a95f1da) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/tinfoil.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py
index 5c5be456e2..a8e835d29c 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -725,19 +725,9 @@ class Tinfoil:
725 # Borrowed from knotty, instead somewhat hackily we use the helper 725 # Borrowed from knotty, instead somewhat hackily we use the helper
726 # as the object to store "shutdown" on 726 # as the object to store "shutdown" on
727 helper = bb.ui.uihelper.BBUIHelper() 727 helper = bb.ui.uihelper.BBUIHelper()
728 # We set up logging optionally in the constructor so now we need to
729 # grab the handlers to pass to TerminalFilter
730 console = None
731 errconsole = None
732 for handler in self.logger.handlers:
733 if isinstance(handler, logging.StreamHandler):
734 if handler.stream == sys.stdout:
735 console = handler
736 elif handler.stream == sys.stderr:
737 errconsole = handler
738 helper.shutdown = 0 728 helper.shutdown = 0
739 parseprogress = None 729 parseprogress = None
740 termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) 730 termfilter = bb.ui.knotty.TerminalFilter(helper, helper, self.logger.handlers, quiet=self.quiet)
741 try: 731 try:
742 while True: 732 while True:
743 try: 733 try: