diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-26 15:53:57 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-26 18:04:35 +0000 |
| commit | 95d8631b3bdf216001e57f48277535c65a4cc49e (patch) | |
| tree | 414b6c5e6139ae3b2b38d717bb24881438bc71fa /scripts/lib/devtool | |
| parent | 0a39b907ff997c3a62c92ab22325c726b612de5b (diff) | |
| download | openembedded-core-95d8631b3bdf216001e57f48277535c65a4cc49e.tar.gz openembedded-core-95d8631b3bdf216001e57f48277535c65a4cc49e.tar.bz2 openembedded-core-95d8631b3bdf216001e57f48277535c65a4cc49e.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 5 |
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): 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) |