From 562fd5f2a72f8e4925bf2f14cb5fbd015c591b4f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 10 Jun 2010 10:36:06 -0700 Subject: [PATCH] Drop unnecessarly duplicated messages wrt FuncFailed (Bitbake rev: 9ec9c0e560d4fa6df74a90f598f9db92713525a2) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 1b1775f9db..c6d4060575 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -218,8 +218,7 @@ def exec_func_python(func, d, runfile, logfile): if t in [bb.parse.SkipPackage, bb.build.FuncFailed]: 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): """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() os.chmod(runfile, 0775) if not func: - bb.msg.error(bb.msg.domain.Build, "Function not specified") raise FuncFailed("Function not specified for exec_func_shell") # execute function @@ -262,7 +260,6 @@ def exec_func_shell(func, d, runfile, logfile, flags): if ret == 0: return - bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func) raise FuncFailed("function %s failed" % func, logfile)