From ae71ef4e84be30291f873da1c9de035b5ed66626 Mon Sep 17 00:00:00 2001 From: achetverikov Date: Fri, 25 May 2018 15:41:16 +0200 Subject: [PATCH 1/2] Add check for result=None in clean_queue --- nipype/pipeline/plugins/base.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py index ff84937bc6..e6f2afcc91 100644 --- a/nipype/pipeline/plugins/base.py +++ b/nipype/pipeline/plugins/base.py @@ -156,11 +156,7 @@ def run(self, graph, config, updatehash=False): notrun.append( self._clean_queue( jobid, - graph, - result={ - 'result': None, - 'traceback': '\n'.join(format_exception(*sys.exc_info())) - })) + graph)) else: if result: if result['traceback']: @@ -222,6 +218,9 @@ def _clean_queue(self, jobid, graph, result=None): if self._status_callback: self._status_callback(self.procs[jobid], 'exception') + if result is None: + result={'result': None, + 'traceback': '\n'.join(format_exception(*sys.exc_info()))} if str2bool(self._config['execution']['stop_on_first_crash']): raise RuntimeError("".join(result['traceback'])) From 1e0ac276664e035be1f63cd1c57e57b3b57d360a Mon Sep 17 00:00:00 2001 From: achetverikov Date: Fri, 25 May 2018 16:35:04 +0200 Subject: [PATCH 2/2] Updated formatting in plugins/base.py related to clean_queue --- nipype/pipeline/plugins/base.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py index e6f2afcc91..c41a4a07ce 100644 --- a/nipype/pipeline/plugins/base.py +++ b/nipype/pipeline/plugins/base.py @@ -154,9 +154,7 @@ def run(self, graph, config, updatehash=False): result = self._get_result(taskid) except Exception: notrun.append( - self._clean_queue( - jobid, - graph)) + self._clean_queue(jobid, graph)) else: if result: if result['traceback']: @@ -218,9 +216,9 @@ def _clean_queue(self, jobid, graph, result=None): if self._status_callback: self._status_callback(self.procs[jobid], 'exception') - if result is None: - result={'result': None, - 'traceback': '\n'.join(format_exception(*sys.exc_info()))} + if result is None: + result = {'result': None, + 'traceback': '\n'.join(format_exception(*sys.exc_info()))} if str2bool(self._config['execution']['stop_on_first_crash']): raise RuntimeError("".join(result['traceback']))