[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6743/8267] wic: build wic-tools only if wic is run manually

[Emmanuele Bassi <ebassi src gnome org>]

commit 116e14fc4531d63ad0872f2c5218bad04bdfb348
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Jul 14 15:33:02 2017 +0300

    wic: build wic-tools only if wic is run manually
    
    When wic can't find native sysroot it tries to build wic-tools
    However, it's not possible when wic is run from bitbake.
    Moreover, it's not even feasible anymore as wic-tools should be
    used only when wic is run manually.
    
    Checked if wic is run manually before building wic-tools.
    
    (From OE-Core rev: 522ac21831944b06fbcc372ac61762576d792c22)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/wic |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/wic b/scripts/wic
index b8d2a86..02bc82c 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -164,15 +164,15 @@ def wic_create_subcommand(options, usage_str):
                            "(Use -e/--image-name to specify it)")
         native_sysroot = options.native_sysroot
 
-    if not native_sysroot or not os.path.isdir(native_sysroot):
+    if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)):
         logger.info("Building wic-tools...\n")
         if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
                         cookerdata.CookerConfiguration()):
             raise WicError("bitbake wic-tools failed")
         native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
-        if not native_sysroot:
-            raise WicError("Unable to find the location of the native "
-                           "tools sysroot to use")
+
+    if not native_sysroot:
+        raise WicError("Unable to find the location of the native tools sysroot")
 
     wks_file = options.wks_file