From 8f683bf782d065b81bb7cdb2074839790981d4b7 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 8 Apr 2014 16:09:34 +0200 Subject: bitbake: bitbake: knotty: Clear footer before outputting to stderr With the recent change to split the log output to stdout and stderr, error messages that appeared while the footer was printed got all messed up. This was because the messages to stderr was output _after_ the footer, then clearFooter() tried to remove the footer but removed the error message and parts of the footer. (Bitbake rev: 4fafea4fa69542b491e84463f6eae0d5bf645673) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/knotty.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/ui/knotty.py') diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 80a4b327fa..41f1ba83af 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -133,7 +133,7 @@ class TerminalFilter(object): cr = (25, 80) return cr[1] - def __init__(self, main, helper, console, format): + def __init__(self, main, helper, console, errconsole, format): self.main = main self.helper = helper self.cuu = None @@ -174,6 +174,7 @@ class TerminalFilter(object): except: self.cuu = None console.addFilter(InteractConsoleLogFilter(self, format)) + errconsole.addFilter(InteractConsoleLogFilter(self, format)) def clearFooter(self): if self.footer_present: @@ -309,7 +310,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): warnings = 0 taskfailures = [] - termfilter = tf(main, helper, console, format) + termfilter = tf(main, helper, console, errconsole, format) atexit.register(termfilter.finish) while True: -- cgit v1.2.3-54-g00ecf