revert changing _report_crash signature

Author: oesteban

nipype/pipeline/plugins/base.py

@@ -197,18 +197,13 @@ def _get_result(self, taskid):
     def _submit_job(self, node, updatehash=False):
         raise NotImplementedError
 
-    def _report_crash(self, node, result=None, traceback=None):
-        # Overwrite traceback if comes with result
-        # to keep compatibility
+    def _report_crash(self, node, result=None):
+        tb = None
         if result is not None:
             node._result = result['result']
-            if 'traceback' in result:
-                traceback = result['traceback']
-
-        if traceback is not None:
-            node._traceback = traceback
-
-        return report_crash(node, traceback=traceback)
+            tb = result['traceback']
+            node._traceback = tb
+        return report_crash(node, traceback=tb)
 
     def _clear_task(self, taskid):
         raise NotImplementedError

nipype/pipeline/plugins/multiproc.py

@@ -238,8 +238,10 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):
                     num_subnodes = self.procs[jobid].num_subnodes()
                 except Exception:
                     traceback = format_exception(*sys.exc_info())
-                    self._report_crash(self.procs[jobid], traceback=traceback)
-                    self._clean_queue(jobid, graph)
+                    self._clean_queue(
+                        jobid, graph,
+                        result={'result': None, 'traceback': traceback}
+                    )
                     self.proc_pending[jobid] = False
                     continue
                 if num_subnodes > 1:
@@ -275,10 +277,13 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):
                 logger.debug('Running node %s on master thread',
                              self.procs[jobid])
                 try:
-                    self.procs[jobid].run()
+                    self.procs[jobid].run(updatehash=updatehash)
                 except Exception:
                     traceback = format_exception(*sys.exc_info())
-                    self._report_crash(self.procs[jobid], traceback=traceback)
+                    self._clean_queue(
+                        jobid, graph,
+                        result={'result': None, 'traceback': traceback}
+                    )
 
                 # Release resources
                 self._task_finished_cb(jobid)