Drop unnecessarly duplicated messages wrt FuncFailed
(Bitbake rev: 9ec9c0e560d4fa6df74a90f598f9db92713525a2) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
6092312acc
commit
562fd5f2a7
|
@ -218,8 +218,7 @@ def exec_func_python(func, d, runfile, logfile):
|
||||||
|
|
||||||
if t in [bb.parse.SkipPackage, bb.build.FuncFailed]:
|
if t in [bb.parse.SkipPackage, bb.build.FuncFailed]:
|
||||||
raise
|
raise
|
||||||
bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func)
|
raise FuncFailed("Function %s failed" % func, logfile)
|
||||||
raise FuncFailed("function %s failed" % func, logfile)
|
|
||||||
|
|
||||||
def exec_func_shell(func, d, runfile, logfile, flags):
|
def exec_func_shell(func, d, runfile, logfile, flags):
|
||||||
"""Execute a shell BB 'function' Returns true if execution was successful.
|
"""Execute a shell BB 'function' Returns true if execution was successful.
|
||||||
|
@ -248,7 +247,6 @@ def exec_func_shell(func, d, runfile, logfile, flags):
|
||||||
f.close()
|
f.close()
|
||||||
os.chmod(runfile, 0775)
|
os.chmod(runfile, 0775)
|
||||||
if not func:
|
if not func:
|
||||||
bb.msg.error(bb.msg.domain.Build, "Function not specified")
|
|
||||||
raise FuncFailed("Function not specified for exec_func_shell")
|
raise FuncFailed("Function not specified for exec_func_shell")
|
||||||
|
|
||||||
# execute function
|
# execute function
|
||||||
|
@ -262,7 +260,6 @@ def exec_func_shell(func, d, runfile, logfile, flags):
|
||||||
if ret == 0:
|
if ret == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func)
|
|
||||||
raise FuncFailed("function %s failed" % func, logfile)
|
raise FuncFailed("function %s failed" % func, logfile)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue