aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAmanda Brindle <amanda.r.brindle@intel.com>2018-03-22 12:12:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-25 09:40:23 +0100
commitf8321dedec7abe392f7e49ff8eee0640463adae5 (patch)
treed2feec24ed5198309bb070bcd37497c5b56be9c1 /meta
parentcc438ac7711dedbe05d654e99af9316c9215b02e (diff)
downloadopenembedded-core-contrib-f8321dedec7abe392f7e49ff8eee0640463adae5.tar.gz
waf.bbclass: Throw error if waf doesn't exist
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/waf.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index f9a851d075..19e93761b3 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -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"