mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'fix-crash-with-config-yml' into 'master'
fix stacktrace crash when env vars are badly set in config.yml See merge request fdroid/fdroidserver!827
This commit is contained in:
commit
0f48a052cc
@ -388,6 +388,7 @@ def read_config(opts):
|
||||
limit = config['git_mirror_size_limit']
|
||||
config['git_mirror_size_limit'] = parse_human_readable_size(limit)
|
||||
|
||||
confignames_to_delete = set()
|
||||
for configname, dictvalue in config.items():
|
||||
if configname == 'java_paths':
|
||||
new = dict()
|
||||
@ -403,14 +404,17 @@ def read_config(opts):
|
||||
if env:
|
||||
config[configname] = env
|
||||
else:
|
||||
del(config[configname])
|
||||
confignames_to_delete.add(configname)
|
||||
logging.error(_('Environment variable {var} from {configname} is not set!')
|
||||
.format(var=k, configname=configname))
|
||||
else:
|
||||
del(config[configname])
|
||||
confignames_to_delete.add(configname)
|
||||
logging.error(_('Unknown entry {key} in {configname}')
|
||||
.format(key=k, configname=configname))
|
||||
|
||||
for configname in confignames_to_delete:
|
||||
del(config[configname])
|
||||
|
||||
return config
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user