mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge remote-tracking branch 'origin/release_17.01' into backport-hardening-17.05
This commit is contained in:
+2
-2
@@ -111,10 +111,10 @@ def main(argv):
|
||||
print('Loading GRT ini...')
|
||||
try:
|
||||
with open(args.config) as f:
|
||||
config_dict = yaml.load(f)
|
||||
config_dict = yaml.safe_load(f)
|
||||
except Exception:
|
||||
with open(sample_config) as f:
|
||||
config_dict = yaml.load(f)
|
||||
config_dict = yaml.safe_load(f)
|
||||
|
||||
# set to 0 by default
|
||||
if 'last_job_id_sent' not in config_dict:
|
||||
|
||||
Reference in New Issue
Block a user