opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tool-shed-config-validate

Browse Source
This commit is contained in:
ValentinChCloud
2018-01-19 10:28:14 +00:00
parent 3c85407ec8
commit 747309b278
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/config_manage.py
+8 -9
View File
@@ -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)