diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-06-10 10:36:06 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:36 +0100 |
commit | 562fd5f2a72f8e4925bf2f14cb5fbd015c591b4f (patch) | |
tree | d1a2a1e1455c5424cb6db457046da36ff2259dfa /bitbake/lib/bb/build.py | |
parent | 6092312acc05be5ebae91ca582936c7cb1a67619 (diff) | |
download | poky-562fd5f2a72f8e4925bf2f14cb5fbd015c591b4f.tar.gz |
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>
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r-- | bitbake/lib/bb/build.py | 5 |
1 files changed, 1 insertions, 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): | |||
218 | 218 | ||
219 | if t in [bb.parse.SkipPackage, bb.build.FuncFailed]: | 219 | if t in [bb.parse.SkipPackage, bb.build.FuncFailed]: |
220 | raise | 220 | raise |
221 | bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func) | 221 | raise FuncFailed("Function %s failed" % func, logfile) |
222 | raise FuncFailed("function %s failed" % func, logfile) | ||
223 | 222 | ||
224 | def exec_func_shell(func, d, runfile, logfile, flags): | 223 | def exec_func_shell(func, d, runfile, logfile, flags): |
225 | """Execute a shell BB 'function' Returns true if execution was successful. | 224 | """Execute a shell BB 'function' Returns true if execution was successful. |
@@ -248,7 +247,6 @@ def exec_func_shell(func, d, runfile, logfile, flags): | |||
248 | f.close() | 247 | f.close() |
249 | os.chmod(runfile, 0775) | 248 | os.chmod(runfile, 0775) |
250 | if not func: | 249 | if not func: |
251 | bb.msg.error(bb.msg.domain.Build, "Function not specified") | ||
252 | raise FuncFailed("Function not specified for exec_func_shell") | 250 | raise FuncFailed("Function not specified for exec_func_shell") |
253 | 251 | ||
254 | # execute function | 252 | # execute function |
@@ -262,7 +260,6 @@ def exec_func_shell(func, d, runfile, logfile, flags): | |||
262 | if ret == 0: | 260 | if ret == 0: |
263 | return | 261 | return |
264 | 262 | ||
265 | bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func) | ||
266 | raise FuncFailed("function %s failed" % func, logfile) | 263 | raise FuncFailed("function %s failed" % func, logfile) |
267 | 264 | ||
268 | 265 | ||