kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00
Code Activity

Merge branch 'fix-crash-with-config-yml' into 'master'

Browse Source 
fix stacktrace crash when env vars are badly set in config.yml

See merge request fdroid/fdroidserver!827
This commit is contained in:
Hans-Christoph Steiner 2020-11-12 16:49:35 +00:00
commit 0f48a052cc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdroidserver/common.py
View File

@ -388,6 +388,7 @@ def read_config(opts):
limit = config['git_mirror_size_limit'] limit = config['git_mirror_size_limit']
config['git_mirror_size_limit'] = parse_human_readable_size(limit) config['git_mirror_size_limit'] = parse_human_readable_size(limit)
confignames_to_delete = set()
for configname, dictvalue in config.items(): for configname, dictvalue in config.items():
if configname == 'java_paths': if configname == 'java_paths':
new = dict() new = dict()
@ -403,14 +404,17 @@ def read_config(opts):
if env: if env:
config[configname] = env config[configname] = env
else: else:
del(config[configname]) confignames_to_delete.add(configname)
logging.error(_('Environment variable {var} from {configname} is not set!') logging.error(_('Environment variable {var} from {configname} is not set!')
.format(var=k, configname=configname)) .format(var=k, configname=configname))
else: else:
del(config[configname]) confignames_to_delete.add(configname)
logging.error(_('Unknown entry {key} in {configname}') logging.error(_('Unknown entry {key} in {configname}')
.format(key=k, configname=configname)) .format(key=k, configname=configname))
for configname in confignames_to_delete:
del(config[configname])
return config return config