summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:07:02 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 12:25:06 +0000
commit7ebca83926720164358be298cfcebecba2427760 (patch)
tree00c34500c28075b94e62a13cc50aa144c0234648 /bitbake/lib
parent568409faa1e0735467f08fc1bff0c925c8bf80c5 (diff)
downloadpoky-7ebca83926720164358be298cfcebecba2427760.tar.gz
bitbake: knotty: fix --observe-only option
If we're in observe-only mode then we cannot run commands that would affect the server's state, including getSetVariable, so prevent that from being called in observe-only mode. (Bitbake rev: 2c5a8661430edebff67ab4a108995033d182b5d6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/knotty.py10
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
315def _log_settings_from_server(server): 315def _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
341def main(server, eventHandler, params, tf = TerminalFilter): 345def 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