From 7975798afb7975d13578ea791b3e7824641c9973 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 26 Oct 2015 11:41:11 -0400 Subject: [PATCH] Do not attempt to read the `load` attribute of job runner plugins that do not have a `load` attribute. `load` is an optional attrib on the tag in job_conf.xml, used by the dynamic runner (which is always/automatically loaded) to pass plugin params. Galaxy servers using a `load`-less plugin will fail to start if using run.sh without this fix. --- lib/galaxy/dependencies/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py index 27dda0ed5d7..7bbbd70768b 100644 --- a/lib/galaxy/dependencies/__init__.py +++ b/lib/galaxy/dependencies/__init__.py @@ -25,7 +25,7 @@ class ConditionalDependencies( object ): "job_config_file", join( dirname( self.config_file ), 'job_conf.xml' ) ) try: - for plugin in ElementTree.parse( job_conf_xml ).find( 'plugins' ): + for plugin in ElementTree.parse( job_conf_xml ).findall( './plugins/plugin[@load]' ): self.job_runners.append( plugin.attrib['load'] ) except (OSError, IOError): pass