Skip to content

Commit ce6f37c

Browse files
authored
Merge pull request #2364 from mgxd/fix/nodelog
fix: logging error if % in node cmd
2 parents 157d3bd + df80e44 commit ce6f37c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
.DS_Store
2020
nipype/testing/data/von-ray_errmap.nii.gz
2121
nipype/testing/data/von_errmap.nii.gz
22+
nipype/testing/data/.proc*
2223
crash*.pklz
2324
.coverage
2425
htmlcov/

nipype/pipeline/engine/nodes.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -600,25 +600,26 @@ def _run_command(self, execute, copyfiles=True):
600600
self._originputs = deepcopy(self._interface.inputs)
601601
self._copyfiles_to_wd(execute=execute)
602602

603-
message = '[Node] Running "%s" ("%s.%s")'
603+
message = '[Node] Running "{}" ("{}.{}")'.format(
604+
self.name, self._interface.__module__,
605+
self._interface.__class__.__name__)
604606
if issubclass(self._interface.__class__, CommandLine):
605607
try:
606608
cmd = self._interface.cmdline
607609
except Exception as msg:
608-
result.runtime.stderr = '%s\n\n%s' % (
610+
result.runtime.stderr = '{}\n\n{}'.format(
609611
getattr(result.runtime, 'stderr', ''), msg)
610612
_save_resultfile(result, outdir, self.name)
611613
raise
612614
cmdfile = op.join(outdir, 'command.txt')
613615
with open(cmdfile, 'wt') as fd:
614616
print(cmd + "\n", file=fd)
615-
message += ', a CommandLine Interface with command:\n%s' % cmd
616-
logger.info(message, self.name, self._interface.__module__,
617-
self._interface.__class__.__name__)
617+
message += ', a CommandLine Interface with command:\n{}'.format(cmd)
618+
logger.info(message)
618619
try:
619620
result = self._interface.run()
620621
except Exception as msg:
621-
result.runtime.stderr = '%s\n\n%s' % (
622+
result.runtime.stderr = '%s\n\n%s'.format(
622623
getattr(result.runtime, 'stderr', ''), msg)
623624
_save_resultfile(result, outdir, self.name)
624625
raise

0 commit comments

Comments
 (0)