mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

"field will be in random order" only applies to config.py

Browse source 
YAML only has lists, no sets or tuples, so this warning can only ever make
any sense when config.py is the active config file.
This commit is contained in:
Hans-Christoph Steiner 2023-12-07 21:36:44 +01:00
parent a1d9d9d885
commit d7a673523d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/common.py
View file

@ -429,12 +429,12 @@ def read_config(opts=None):
code = compile(fp.read(), old_config_file, 'exec') code = compile(fp.read(), old_config_file, 'exec')
exec(code, None, config) # nosec TODO automatically migrate exec(code, None, config) # nosec TODO automatically migrate
for k in ('mirrors', 'install_list', 'uninstall_list', 'serverwebroot', 'servergitroot'): for k in ('mirrors', 'install_list', 'uninstall_list', 'serverwebroot', 'servergitroot'):
if k in config: if k in config:
if not type(config[k]) in (str, list, tuple): if not type(config[k]) in (str, list, tuple):
logging.warning( logging.warning(
_("'{field}' will be in random order! Use () or [] brackets if order is important!") _("'{field}' will be in random order! Use () or [] brackets if order is important!")
.format(field=k)) .format(field=k))
# smartcardoptions must be a list since its command line args for Popen # smartcardoptions must be a list since its command line args for Popen
smartcardoptions = config.get('smartcardoptions') smartcardoptions = config.get('smartcardoptions')