diff options
| -rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 3390eb73ac..521c262e45 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
| @@ -312,7 +312,7 @@ class TerminalFilter(object): | |||
| 312 | fd = sys.stdin.fileno() | 312 | fd = sys.stdin.fileno() |
| 313 | self.termios.tcsetattr(fd, self.termios.TCSADRAIN, self.stdinbackup) | 313 | self.termios.tcsetattr(fd, self.termios.TCSADRAIN, self.stdinbackup) |
| 314 | 314 | ||
| 315 | def _log_settings_from_server(server): | 315 | def _log_settings_from_server(server, observe_only): |
| 316 | # Get values of variables which control our output | 316 | # Get values of variables which control our output |
| 317 | includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"]) | 317 | includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"]) |
| 318 | if error: | 318 | if error: |
| @@ -322,7 +322,11 @@ def _log_settings_from_server(server): | |||
| 322 | if error: | 322 | if error: |
| 323 | logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error) | 323 | logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error) |
| 324 | raise BaseException(error) | 324 | raise BaseException(error) |
| 325 | consolelogfile, error = server.runCommand(["getSetVariable", "BB_CONSOLELOG"]) | 325 | if observe_only: |
| 326 | cmd = 'getVariable' | ||
| 327 | else: | ||
| 328 | cmd = 'getSetVariable' | ||
| 329 | consolelogfile, error = server.runCommand([cmd, "BB_CONSOLELOG"]) | ||
| 326 | if error: | 330 | if error: |
| 327 | logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) | 331 | logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) |
| 328 | raise BaseException(error) | 332 | raise BaseException(error) |
| @@ -340,7 +344,7 @@ _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.Lo | |||
| 340 | 344 | ||
| 341 | def main(server, eventHandler, params, tf = TerminalFilter): | 345 | def main(server, eventHandler, params, tf = TerminalFilter): |
| 342 | 346 | ||
| 343 | includelogs, loglines, consolelogfile = _log_settings_from_server(server) | 347 | includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only) |
| 344 | 348 | ||
| 345 | if sys.stdin.isatty() and sys.stdout.isatty(): | 349 | if sys.stdin.isatty() and sys.stdout.isatty(): |
| 346 | log_exec_tty = True | 350 | log_exec_tty = True |
