From 9ec830aad08ab71c2b4822d2b11941a6f996df4e Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 10 Jan 2022 15:43:24 +0100 Subject: [PATCH] Don't template version command --- lib/galaxy/tools/evaluation.py | 8 ++++---- test/functional/tools/version_command_plain.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/tools/evaluation.py b/lib/galaxy/tools/evaluation.py index efa610513a3..6f4eed1fa99 100644 --- a/lib/galaxy/tools/evaluation.py +++ b/lib/galaxy/tools/evaluation.py @@ -456,10 +456,6 @@ class ToolEvaluator: param_dict = self.param_dict interpreter = self.tool.interpreter version_string_cmd_raw = self.tool.version_string_cmd - if version_string_cmd_raw: - version_command_template = string.Template(version_string_cmd_raw) - version_string_cmd = version_command_template.safe_substitute({"__tool_directory__": self.compute_environment.tool_directory()}) - command = f"{version_string_cmd} > {self.compute_environment.version_path()} 2>&1;\n{command}" command_line = None if not command: return @@ -483,6 +479,10 @@ class ToolEvaluator: tool_dir = os.path.abspath(self.tool.tool_dir) abs_executable = os.path.join(tool_dir, executable) command_line = command_line.replace(executable, f"{interpreter} {shlex.quote(abs_executable)}", 1) + if version_string_cmd_raw: + version_command_template = string.Template(version_string_cmd_raw) + version_string_cmd = version_command_template.safe_substitute({"__tool_directory__": self.compute_environment.tool_directory()}) + command_line = f"{version_string_cmd} > {self.compute_environment.version_path()} 2>&1;\n{command_line}" self.command_line = command_line def _build_config_files(self): diff --git a/test/functional/tools/version_command_plain.xml b/test/functional/tools/version_command_plain.xml index 8eb4e6904db..1ca1b7085fd 100644 --- a/test/functional/tools/version_command_plain.xml +++ b/test/functional/tools/version_command_plain.xml @@ -1,6 +1,6 @@