Skip to content

Commit 050a169

Browse files
committed
Merge pull request #7 from chrisfilo/enh/distlogging
Enh/distlogging
2 parents 287105e + 0264960 commit 050a169

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

nipype/pipeline/engine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,8 +1094,8 @@ def run(self, updatehash=False):
10941094
except:
10951095
pass
10961096
else:
1097-
logdebug_dict_differences(prev_inputs,
1098-
hashed_inputs)
1097+
logging.logdebug_dict_differences(prev_inputs,
1098+
hashed_inputs)
10991099
if (str2bool(self.config['execution']['stop_on_first_rerun']) and
11001100
not (self.overwrite == None and self._interface.always_run)):
11011101
raise Exception(("Cannot rerun when 'stop_on_first_rerun' "

nipype/pipeline/plugins/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,8 @@ def _submit_job(self, node, updatehash=False):
494494
'result_%%s.pklz'%%info['node'].name)
495495
savepkl(resultsfile, dict(result=result, hostname=gethostname(),
496496
traceback=traceback))
497-
""" % (node.config, pkl_file, batch_dir, suffix)
497+
"""
498+
cmdstr = cmdstr % (node.config, pkl_file, batch_dir, suffix)
498499
pyscript = os.path.join(batch_dir, 'pyscript_%s.py' % suffix)
499500
fp = open(pyscript, 'wt')
500501
fp.writelines(cmdstr)

0 commit comments

Comments
 (0)