summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/knotty.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:12:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit260a22b241b81241c9edff2643f03fc3a31df38b (patch)
tree499aa49fe37a6ab4b811b39cb1e105dd0070d79a /bitbake/lib/bb/ui/knotty.py
parent0b331bc4c97e29c47dcb6b4df9ee9a99795dd948 (diff)
downloadpoky-260a22b241b81241c9edff2643f03fc3a31df38b.tar.gz
bitbake: ui/knotty: Send updateConfig early
If for example you run: bitbake -r somefile.inc rm somefile.inc bitbake -e bitbake will crash with an error about not being able to find somefile.inc. This is because it tries to reparse the base config for the early getVariable requests before it sees the updated missing -r option. Send the updateConfig command earlier to avoid this. (Bitbake rev: a38164620ebdc770690c5f39ff9ed69d3f82719e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/knotty.py')
-rw-r--r--bitbake/lib/bb/ui/knotty.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index f3900bdd05..6b0781d8f0 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -344,6 +344,9 @@ _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.Lo
344 344
345def main(server, eventHandler, params, tf = TerminalFilter): 345def main(server, eventHandler, params, tf = TerminalFilter):
346 346
347 if not params.observe_only:
348 params.updateToServer(server, os.environ.copy())
349
347 includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only) 350 includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only)
348 351
349 if sys.stdin.isatty() and sys.stdout.isatty(): 352 if sys.stdin.isatty() and sys.stdout.isatty():
@@ -398,7 +401,6 @@ def main(server, eventHandler, params, tf = TerminalFilter):
398 universe = False 401 universe = False
399 if not params.observe_only: 402 if not params.observe_only:
400 params.updateFromServer(server) 403 params.updateFromServer(server)
401 params.updateToServer(server, os.environ.copy())
402 cmdline = params.parseActions() 404 cmdline = params.parseActions()
403 if not cmdline: 405 if not cmdline:
404 print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") 406 print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")