From 33d312b906ac4c50554fb1bff1e0dc39bdaea077 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 28 Mar 2016 15:13:24 -0400 Subject: [PATCH] [16.01] Fix for running jobs when metadata tool is not in toolbox. Happens when -installed or -migrated are passed into run_tests.sh because of the way the tool shed hacks up Galaxy's tool config. --- lib/galaxy/jobs/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 5fd087be476..25d46b57481 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1662,10 +1662,12 @@ class JobWrapper( object ): **kwds ) if resolve_metadata_dependencies: metadata_tool = self.app.toolbox.get_tool("__SET_METADATA__") - dependency_shell_commands = metadata_tool.build_dependency_shell_commands(job_directory=self.working_directory) - if dependency_shell_commands: - dependency_shell_commands = "; ".join(dependency_shell_commands) - command = "%s; %s" % (dependency_shell_commands, command) + if metadata_tool is not None: + # Due to tool shed hacks for migrate and installed tool tests... + dependency_shell_commands = metadata_tool.build_dependency_shell_commands(job_directory=self.working_directory) + if dependency_shell_commands: + dependency_shell_commands = "; ".join(dependency_shell_commands) + command = "%s; %s" % (dependency_shell_commands, command) return command @property