[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2573/8267] runqemu: validate paths and attempt to infer unset paths

[Emmanuele Bassi <ebassi src gnome org>]

commit cd47b648af422a979477df70e1e5f195ff24c6ec
Author: Joshua Lock <joshua g lock intel com>
Date:   Wed Sep 21 20:35:36 2016 +0100

    runqemu: validate paths and attempt to infer unset paths
    
    We need to validate and ensure all paths are set regardless of
    whether runqemu was invoked with a .qemuboot.conf file or
    otherwise. Split this logic out into a separate method called
    during check_and_set()
    
    (From OE-Core rev: e843b2d49a151c1fe0d2a7ba00c41d2a35775736)
    
    Signed-off-by: Joshua Lock <joshua g lock intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 08dc306..5170d87 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -536,6 +536,7 @@ class BaseConfig(object):
 
     def check_and_set(self):
         """Check configs sanity and set when needed"""
+        self.validate_paths()
         check_tun()
         # Check audio
         if self.audio_enabled:
@@ -598,6 +599,8 @@ class BaseConfig(object):
             k_upper = k.upper()
             self.set(k_upper, v)
 
+    def validate_paths(self):
+        """Ensure all relevant path variables are set"""
         # When we're started with a *.qemuboot.conf arg assume that image
         # artefacts are relative to that file, rather than in whatever
         # directory DEPLOY_DIR_IMAGE in the conf file points to.