diff options
Diffstat (limited to 'bitbake/lib/bb/ui/knotty.py')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 6ea7d8694c..389c3cc64d 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -216,7 +216,7 @@ class TerminalFilter(object): | |||
216 | fd = sys.stdin.fileno() | 216 | fd = sys.stdin.fileno() |
217 | self.termios.tcsetattr(fd, self.termios.TCSADRAIN, self.stdinbackup) | 217 | self.termios.tcsetattr(fd, self.termios.TCSADRAIN, self.stdinbackup) |
218 | 218 | ||
219 | def main(server, eventHandler, tf = TerminalFilter): | 219 | def main(server, eventHandler, params, tf = TerminalFilter): |
220 | 220 | ||
221 | # Get values of variables which control our output | 221 | # Get values of variables which control our output |
222 | includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"]) | 222 | includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"]) |
@@ -245,7 +245,8 @@ def main(server, eventHandler, tf = TerminalFilter): | |||
245 | bb.msg.addDefaultlogFilter(console) | 245 | bb.msg.addDefaultlogFilter(console) |
246 | console.setFormatter(format) | 246 | console.setFormatter(format) |
247 | logger.addHandler(console) | 247 | logger.addHandler(console) |
248 | if consolelogfile: | 248 | |
249 | if consolelogfile and not params.options.show_environment: | ||
249 | bb.utils.mkdirhier(os.path.dirname(consolelogfile)) | 250 | bb.utils.mkdirhier(os.path.dirname(consolelogfile)) |
250 | conlogformat = bb.msg.BBLogFormatter(format_str) | 251 | conlogformat = bb.msg.BBLogFormatter(format_str) |
251 | consolelog = logging.FileHandler(consolelogfile) | 252 | consolelog = logging.FileHandler(consolelogfile) |
@@ -254,14 +255,16 @@ def main(server, eventHandler, tf = TerminalFilter): | |||
254 | logger.addHandler(consolelog) | 255 | logger.addHandler(consolelog) |
255 | 256 | ||
256 | try: | 257 | try: |
257 | cmdline, error = server.runCommand(["getCmdLineAction"]) | 258 | params.updateFromServer(server) |
258 | if error: | 259 | cmdline = params.parseActions() |
259 | logger.error("Unable to get bitbake commandline arguments: %s" % error) | 260 | if not cmdline: |
260 | return 1 | ||
261 | elif not cmdline: | ||
262 | print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") | 261 | print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") |
263 | return 1 | 262 | return 1 |
264 | ret, error = server.runCommand(cmdline) | 263 | if 'msg' in cmdline and cmdline['msg']: |
264 | logger.error(cmdline['msg']) | ||
265 | return 1 | ||
266 | |||
267 | ret, error = server.runCommand(cmdline['action']) | ||
265 | if error: | 268 | if error: |
266 | logger.error("Command '%s' failed: %s" % (cmdline, error)) | 269 | logger.error("Command '%s' failed: %s" % (cmdline, error)) |
267 | return 1 | 270 | return 1 |