From: Ulf Magnusson Date: Sat, 1 Oct 2016 02:47:11 +0000 (+0200) Subject: cmake: Use bb.fatal() instead of raising FuncFailed X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~23972 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff310dd103e16a5345a4bb48090af05f50171de3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cmake: Use bb.fatal() instead of raising FuncFailed This sets a good example and avoids unnecessarily contributing to perceived complexity and cargo culting. Motivating quote below: < kergoth> the *original* intent was for the function/task to error via whatever appropriate means, bb.fatal, whatever, and funcfailed was what you'd catch if you were calling exec_func/exec_task. that is, it's what those functions raise, not what metadata functions should be raising < kergoth> it didn't end up being used that way < kergoth> but there's really never a reason to raise it yourself FuncFailed.__init__ takes a 'name' argument rather than a 'msg' argument, which also shows that the original purpose got lost. Signed-off-by: Ulf Magnusson Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/cmake/cmake_3.6.1.bb b/meta/recipes-devtools/cmake/cmake_3.6.1.bb index 67ba9c473d5..850d6de231e 100644 --- a/meta/recipes-devtools/cmake/cmake_3.6.1.bb +++ b/meta/recipes-devtools/cmake/cmake_3.6.1.bb @@ -14,7 +14,7 @@ python () { docdir=d.getVar("docdir", True) if not docdir.startswith(prefix): - raise bb.build.FuncFailed('docdir must contain prefix as its prefix') + bb.fatal('docdir must contain prefix as its prefix') docdir_stripped = docdir[len(prefix):] if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':