Merge pull request #11343 from nsoranzo/release_21.01_interpreter_command_line_fix

[21.01] Fix command line building when using interpreter
This commit is contained in:
John Chilton
2021-02-10 18:00:55 -05:00
committed by GitHub
+2 -4
View File
@@ -495,12 +495,10 @@ class ToolEvaluator:
raise
if interpreter:
# TODO: path munging for cluster/dataset server relocatability
command_line_tokens = shlex.split(command_line)
executable = command_line_tokens[0]
executable = command_line.split()[0]
tool_dir = os.path.abspath(self.tool.tool_dir)
abs_executable = os.path.join(tool_dir, executable)
command_line_tokens[0:1] = [interpreter, abs_executable]
command_line = ' '.join(map(shlex.quote, command_line_tokens))
command_line = command_line.replace(executable, f"{interpreter} {shlex.quote(abs_executable)}", 1)
self.command_line = command_line
def __build_config_files(self):