From f8321dedec7abe392f7e49ff8eee0640463adae5 Mon Sep 17 00:00:00 2001 From: Amanda Brindle Date: Thu, 22 Mar 2018 12:12:15 -0700 Subject: 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 Signed-off-by: Ross Burton --- meta/classes/waf.bbclass | 2 ++ 1 file changed, 2 insertions(+) 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" -- cgit 1.2.3-korg