[oe-commits] [bitbake] 07/17: ui/knotty: Send updateConfig early

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit a38164620ebdc770690c5f39ff9ed69d3f82719e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Aug 31 17:12:52 2017 +0100

    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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/ui/knotty.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index f3900bd..6b0781d 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -344,6 +344,9 @@ _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.Lo
 
 def main(server, eventHandler, params, tf = TerminalFilter):
 
+    if not params.observe_only:
+        params.updateToServer(server, os.environ.copy())
+
     includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only)
 
     if sys.stdin.isatty() and sys.stdout.isatty():
@@ -398,7 +401,6 @@ def main(server, eventHandler, params, tf = TerminalFilter):
     universe = False
     if not params.observe_only:
         params.updateFromServer(server)
-        params.updateToServer(server, os.environ.copy())
         cmdline = params.parseActions()
         if not cmdline:
             print("Nothing to do.  Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.