Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Weblate 2016-02-07 20:29:20 +01:00
commit a698af8b0c

View file

@ -1014,7 +1014,7 @@ def _get_app_settings(app_id):
settings = yaml.load(f) settings = yaml.load(f)
if app_id == settings['id']: if app_id == settings['id']:
return settings return settings
except (IOError, KeyError): except (IOError, TypeError, KeyError):
logger.exception(m18n.n('app_not_correctly_installed', logger.exception(m18n.n('app_not_correctly_installed',
app=app_id)) app=app_id))
return {} return {}