opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release_17.09' into dev

Browse Source
This commit is contained in:
Martin Cech
2018-01-25 10:55:41 -05:00
parent 5defdc7919 73418ab787
commit 4e17ce81f4
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
@@ -518,15 +518,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)