Merge branch 'stretch-testing' into stretch-unstable

This commit is contained in:
root 2020-03-27 00:40:21 +00:00
commit 4c594b96f0
2 changed files with 9 additions and 2 deletions

6
debian/changelog vendored
View file

@ -5,6 +5,12 @@ yunohost (3.8.0~alpha) testing; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Mon, 16 Mar 2020 01:00:00 +0000
yunohost (3.7.0.8) stable; urgency=low
- [fix] App_setting delete add if the key doesn't exist
-- Kay0u <pierre@kayou.io> Fri, 27 Mar 2020 00:36:46 +0000
yunohost (3.7.0.7) stable; urgency=low
- [fix] Allow public apps with no sso tile (#894)

View file

@ -1145,8 +1145,9 @@ def app_setting(app, key, value=None, delete=False):
logger.debug("cannot get app setting '%s' for '%s' (%s)", key, app, e)
return None
if delete and key in app_settings:
del app_settings[key]
if delete:
if key in app_settings:
del app_settings[key]
else:
# FIXME: Allow multiple values for some keys?
if key in ['redirected_urls', 'redirected_regex']: