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

Merge branch 'master' into 'master'

do not crash when returned system encoding is None

See merge request fdroid/fdroidserver!671
This commit is contained in:
Michael Pöhn 2019-08-30 19:04:40 +00:00
commit e8c926ba3b

2
fdroid
View File

@ -137,7 +137,7 @@ def main():
mod = __import__('fdroidserver.' + command, None, None, [command])
system_langcode, system_encoding = locale.getdefaultlocale()
if system_encoding.lower() not in ('utf-8', 'utf8'):
if system_encoding is None or system_encoding.lower() not in ('utf-8', 'utf8'):
logging.warn(_("Encoding is set to '{enc}' fdroid might run "
"into encoding issues. Please set it to 'UTF-8' "
"for best results.".format(enc=system_encoding)))