From 747309b2786da3e18cdd962d977b2ee72afdb5dc Mon Sep 17 00:00:00 2001 From: ValentinChCloud Date: Fri, 19 Jan 2018 10:28:14 +0000 Subject: [PATCH] Fix tool-shed-config-validate --- lib/galaxy/webapps/config_manage.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/galaxy/webapps/config_manage.py b/lib/galaxy/webapps/config_manage.py index 685b5abcf56..698c074d882 100644 --- a/lib/galaxy/webapps/config_manage.py +++ b/lib/galaxy/webapps/config_manage.py @@ -397,15 +397,14 @@ def _lint(args, app_desc): def _validate(args, app_desc): path = _find_config(args, app_desc) - with open(path, "r") as f: - # Allow empty mapping (not allowed by pykawlify) - raw_config = _order_load_path(f) - if raw_config.get(app_desc.app_name, None) is None: - raw_config[app_desc.app_name] = {} - config_p = tempfile.NamedTemporaryFile(delete=False, suffix=".yml") - _ordered_dump(raw_config, config_p) - config_p.flush() - path = config_p.name + # Allow empty mapping (not allowed by pykawlify) + raw_config = _order_load_path(path) + if raw_config.get(app_desc.app_name, None) is None: + raw_config[app_desc.app_name] = {} + config_p = tempfile.NamedTemporaryFile(delete=False, suffix=".yml") + _ordered_dump(raw_config, config_p) + config_p.flush() + path = config_p.name fp = tempfile.NamedTemporaryFile(delete=False, suffix=".yml") _ordered_dump(app_desc.schema.raw_schema, fp)