devtool: properly handle bb.build.FuncFailed when extracting source

When we run the tasks required to extract the source for a recipe (e.g.
within "devtool modify" or "devtool extract") if one of those tasks
fails you get a bb.build.FuncFailed exception; handle this properly so
you don't see a traceback.

(From OE-Core rev: 95d8631b3bdf216001e57f48277535c65a4cc49e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2016-01-26 15:53:57 +13:00 committed by Richard Purdie
parent c3f0f7be84
commit 84720c8ce9

View File

@ -386,7 +386,10 @@ class BbTaskExecutor(object):
logger.info('Executing %s...' % func)
fn = self.rdata.getVar('FILE', True)
localdata = bb.build._task_data(fn, func, self.rdata)
bb.build.exec_func(func, localdata)
try:
bb.build.exec_func(func, localdata)
except bb.build.FuncFailed as e:
raise DevtoolError(str(e))
self.executed.append(func)