[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7485/8267] bitbake: ui/knotty: Send updateConfig early

[Emmanuele Bassi <ebassi src gnome org>]

commit 260a22b241b81241c9edff2643f03fc3a31df38b
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu Aug 31 17:12:52 2017 +0100

    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>

 bitbake/lib/bb/ui/knotty.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index f3900bd..6b0781d 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
 
 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.")