]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
waf.bbclass: Throw error if waf doesn't exist
authorAmanda Brindle <amanda.r.brindle@intel.com>
Thu, 22 Mar 2018 19:12:15 +0000 (12:12 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 25 Mar 2018 08:40:23 +0000 (09:40 +0100)
Before, waf.bbclass would fail to catch FileNotFoundError. Now, it will
catch this error and say that waf doesn't exist.

Fixes [YOCTO 12553]

Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/waf.bbclass

index f9a851d07596e7de5f89b27959ffd115a75def79..19e93761b3909ed7914299d475e572df75ae50b6 100644 (file)
@@ -15,6 +15,8 @@ python waf_preconfigure() {
             d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
     except subprocess.CalledProcessError as e:
         bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
+    except FileNotFoundError:
+        bb.fatal("waf does not exist in %s" % subsrcdir)
 }
 
 do_configure[prefuncs] += "waf_preconfigure"