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 pull request #8433 from ic4f/fix_var_naming

Browse Source 
Improve variable naming
This commit is contained in:
John Chilton
2019-08-09 10:30:26 -04:00
committed by GitHub
parent 8ef1fc46f6 b03d9c3d5d
commit e6280d4e49
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config/__init__.py
+10 -10
View File
@@ -156,34 +156,34 @@ class BaseAppConfiguration(object):
return os.path.join(self.sample_config_dir, path)
def _parse_config_file_options(self, defaults, listify_defaults, config_kwargs):
for var, defaults in defaults.items():
for var, values in defaults.items():
if config_kwargs.get(var, None) is not None:
path = config_kwargs.get(var)
setattr(self, var + '_set', True)
else:
for default in defaults:
if os.path.exists(resolve_path(default, self.root)):
path = default
for value in values:
if os.path.exists(resolve_path(value, self.root)):
path = value
break
else:
path = defaults[-1]
path = values[-1]
setattr(self, var + '_set', False)
setattr(self, var, resolve_path(path, self.root))
for var, defaults in listify_defaults.items():
for var, values in listify_defaults.items():
paths = []
if config_kwargs.get(var, None) is not None:
paths = listify(config_kwargs.get(var))
else:
for default in defaults:
for path in listify(default):
for value in values:
for path in listify(value):
if not os.path.exists(resolve_path(path, self.root)):
break
else:
paths = listify(default)
paths = listify(value)
break
else:
paths = listify(defaults[-1])
paths = listify(values[-1])
setattr(self, var, [resolve_path(x, self.root) for x in paths])