Skip to content

Commit

Permalink
Fix nesting error
Browse files Browse the repository at this point in the history
A simple error in indentation that caused job configs to not be read
properly has been fixed.
  • Loading branch information
Matthew Spelchak committed Feb 20, 2018
1 parent ad5100e commit 46f8cb3
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions lib/galaxy/jobs/dynamic_tool_destination.py
Original file line number Diff line number Diff line change
Expand Up @@ -1619,26 +1619,26 @@ def get_destination_list_from_job_config(job_config_location):
local_path = re.compile('^/config/.+$')
if local_path.match(job_config_location):
job_config_location = config_location + job_config_location
else: # Pick one of the default ones
message = "* No job config specified, "
if os.path.isfile(config_location + "/config/job_conf.xml"):
job_config_location = config_location + "/config/job_conf.xml"
message += "using 'config/job_conf.xml'. *"

elif os.path.isfile(config_location +
"/config/job_conf.xml.sample_advanced"):
job_config_location = (config_location
+ "/config/job_conf.xml.sample_advanced")
message += "using 'config/job_conf.xml.sample_advanced'. *"

elif os.path.isfile(config_location +
"/config/job_conf.xml.sample_basic"):
job_config_location = (config_location
+ "/config/job_conf.xml.sample_basic")
message += "using 'config/job_conf.xml.sample_basic'. *"
else:
message += ("and no default job configs in 'config/'. "
+ "Expect lots of failures. *")
else: # Pick one of the default ones
message = "* No job config specified, "
if os.path.isfile(config_location + "/config/job_conf.xml"):
job_config_location = config_location + "/config/job_conf.xml"
message += "using 'config/job_conf.xml'. *"

elif os.path.isfile(config_location +
"/config/job_conf.xml.sample_advanced"):
job_config_location = (config_location
+ "/config/job_conf.xml.sample_advanced")
message += "using 'config/job_conf.xml.sample_advanced'. *"

elif os.path.isfile(config_location +
"/config/job_conf.xml.sample_basic"):
job_config_location = (config_location
+ "/config/job_conf.xml.sample_basic")
message += "using 'config/job_conf.xml.sample_basic'. *"
else:
message += ("and no default job configs in 'config/'. "
+ "Expect lots of failures. *")

if verbose:
log.debug(message)
Expand Down

0 comments on commit 46f8cb3

Please sign in to comment.