Merge pull request #2774 from chrisfilo/enh/crashfiles_order

ENH: Create a crashfile even if 'stop_on_first_crash' is set

Author: effigies

nipype/pipeline/plugins/base.py

@@ -220,9 +220,9 @@ def _clean_queue(self, jobid, graph, result=None):
             result = {'result': None,
                       'traceback': '\n'.join(format_exception(*sys.exc_info()))}
 
+        crashfile = self._report_crash(self.procs[jobid], result=result)
         if str2bool(self._config['execution']['stop_on_first_crash']):
             raise RuntimeError("".join(result['traceback']))
-        crashfile = self._report_crash(self.procs[jobid], result=result)
         if jobid in self.mapnodesubids:
             # remove current jobid
             self.proc_pending[jobid] = False

nipype/pipeline/plugins/linear.py

@@ -46,11 +46,11 @@ def run(self, graph, config, updatehash=False):
                     self._status_callback(node, 'end')
             except:
                 os.chdir(old_wd)
-                if str2bool(config['execution']['stop_on_first_crash']):
-                    raise
                 # bare except, but i really don't know where a
                 # node might fail
                 crashfile = report_crash(node)
+                if str2bool(config['execution']['stop_on_first_crash']):
+                    raise
                 # remove dependencies from queue
                 subnodes = [s for s in dfs_preorder(graph, node)]
                 notrun.append(