summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2014-04-08 16:09:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-08 18:05:26 +0100
commit8f683bf782d065b81bb7cdb2074839790981d4b7 (patch)
tree5832926af2b2f7d2caa1ab169fbc44c70c30da13
parent327ed0bfceb993c914a7fe03f3cab2351b835de6 (diff)
downloadpoky-8f683bf782d065b81bb7cdb2074839790981d4b7.tar.gz
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 <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/knotty.py5
1 files changed, 3 insertions, 2 deletions
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):
133 cr = (25, 80) 133 cr = (25, 80)
134 return cr[1] 134 return cr[1]
135 135
136 def __init__(self, main, helper, console, format): 136 def __init__(self, main, helper, console, errconsole, format):
137 self.main = main 137 self.main = main
138 self.helper = helper 138 self.helper = helper
139 self.cuu = None 139 self.cuu = None
@@ -174,6 +174,7 @@ class TerminalFilter(object):
174 except: 174 except:
175 self.cuu = None 175 self.cuu = None
176 console.addFilter(InteractConsoleLogFilter(self, format)) 176 console.addFilter(InteractConsoleLogFilter(self, format))
177 errconsole.addFilter(InteractConsoleLogFilter(self, format))
177 178
178 def clearFooter(self): 179 def clearFooter(self):
179 if self.footer_present: 180 if self.footer_present:
@@ -309,7 +310,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
309 warnings = 0 310 warnings = 0
310 taskfailures = [] 311 taskfailures = []
311 312
312 termfilter = tf(main, helper, console, format) 313 termfilter = tf(main, helper, console, errconsole, format)
313 atexit.register(termfilter.finish) 314 atexit.register(termfilter.finish)
314 315
315 while True: 316 while True: