opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[16.01] Fix for running jobs when metadata tool is not in toolbox.

Browse Source 
Happens when -installed or -migrated are passed into run_tests.sh because of the way the tool shed hacks up Galaxy's tool config.
This commit is contained in:
John Chilton
2016-03-29 08:04:25 -04:00
parent 671b6933dd
commit 33d312b906
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/__init__.py
+6 -4
View File
@@ -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