summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-26 15:53:57 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 18:05:13 +0000
commit84720c8ce9cde906e47e0390c0cdb7451d752c51 (patch)
tree7223f484e25576566dda8cd4185dc443a76aed94 /scripts
parentc3f0f7be848cf4a43061350a8e3101936ed816dd (diff)
downloadpoky-84720c8ce9cde906e47e0390c0cdb7451d752c51.tar.gz
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 187dff201f..18daf8499d 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -386,7 +386,10 @@ class BbTaskExecutor(object):
386 logger.info('Executing %s...' % func) 386 logger.info('Executing %s...' % func)
387 fn = self.rdata.getVar('FILE', True) 387 fn = self.rdata.getVar('FILE', True)
388 localdata = bb.build._task_data(fn, func, self.rdata) 388 localdata = bb.build._task_data(fn, func, self.rdata)
389 bb.build.exec_func(func, localdata) 389 try:
390 bb.build.exec_func(func, localdata)
391 except bb.build.FuncFailed as e:
392 raise DevtoolError(str(e))
390 self.executed.append(func) 393 self.executed.append(func)
391 394
392 395