]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: Use bb.fatal() instead of raising FuncFailed
authorUlf Magnusson <ulfalizer@gmail.com>
Sat, 1 Oct 2016 02:47:08 +0000 (04:47 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 3 Oct 2016 14:46:21 +0000 (15:46 +0100)
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 <ulfalizer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package.bbclass

index a9ca14164b5dea6b53228ca71104d98a43b45f58..a6f0a7a63d6399689b17ef2c220a139d3483ed26 100644 (file)
@@ -1171,7 +1171,7 @@ python populate_packages () {
                 continue
             ret = bb.utils.copyfile(file, fpath)
             if ret is False or ret == 0:
-                raise bb.build.FuncFailed("File population failed")
+                bb.fatal("File population failed")
 
         # Check if symlink paths exist
         for file in symlink_paths: