From f06860a8fb200f01154e4822b3931f32c882a706 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 1 Dec 2017 15:08:32 -0500 Subject: [PATCH] yaml_config - Don't parse YAML configurations as ini files. --- lib/galaxy/config.py | 2 +- lib/galaxy/webapps/tool_shed/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index cf751d0edb9..e6704cf3a1b 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -531,7 +531,7 @@ class Configuration(object): global_conf_parser = configparser.ConfigParser() self.config_file = None self.global_conf_parser = global_conf_parser - if global_conf and "__file__" in global_conf: + if global_conf and "__file__" in global_conf and ".yml" not in global_conf["__file__"]: self.config_file = global_conf['__file__'] global_conf_parser.read(global_conf['__file__']) # Heartbeat log file name override diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py index 6a46410542f..8069a21a3e6 100644 --- a/lib/galaxy/webapps/tool_shed/config.py +++ b/lib/galaxy/webapps/tool_shed/config.py @@ -134,7 +134,7 @@ class Configuration(object): global_conf = kwargs.get('global_conf', None) global_conf_parser = configparser.ConfigParser() self.global_conf_parser = global_conf_parser - if global_conf and "__file__" in global_conf: + if global_conf and "__file__" in global_conf and ".yml" not in global_conf["__file__"]: global_conf_parser.read(global_conf['__file__']) self.running_functional_tests = string_as_bool(kwargs.get('running_functional_tests', False)) self.citation_cache_type = kwargs.get("citation_cache_type", "file")