From 4279c108ba25cf9cbf119dd76490c8757cde52ca Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 29 Oct 2020 19:58:07 +0100 Subject: [PATCH] Don't forget to handle _regex legacy permission settings --- src/yunohost/backup.py | 12 +++++++++--- .../0019_extends_permissions_features_1.py | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index f8e38fbbe..f6f5530d7 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1355,9 +1355,15 @@ class RestoreManager(): SetupGroupPermissions.migrate_app_permission(app=app_instance_name) # Migrate old settings - if app_setting(app_instance_name, 'skipped_uris') is not None or \ - app_setting(app_instance_name, 'unprotected_uris') is not None or \ - app_setting(app_instance_name, 'protected_uris') is not None: + legacy_permission_settings = [ + "skipped_uris", + "unprotected_uris", + "protected_uris", + "skipped_regex", + "unprotected_regex", + "protected_regex" + ] + if any(app_setting(app_instance_name, setting) is not None for setting in legacy_permission_settings): from yunohost.tools import _get_migration_by_name extends_permissions_features_1 = _get_migration_by_name("extends_permissions_features_1") extends_permissions_features_1.migrate_skipped_unprotected_protected_uris(app=app_instance_name) diff --git a/src/yunohost/data_migrations/0019_extends_permissions_features_1.py b/src/yunohost/data_migrations/0019_extends_permissions_features_1.py index 64c286d90..81d726686 100644 --- a/src/yunohost/data_migrations/0019_extends_permissions_features_1.py +++ b/src/yunohost/data_migrations/0019_extends_permissions_features_1.py @@ -132,6 +132,9 @@ class MyMigration(Migration): app_setting(app, 'skipped_uris', delete=True) app_setting(app, 'unprotected_uris', delete=True) app_setting(app, 'protected_uris', delete=True) + app_setting(app, 'skipped_regex', delete=True) + app_setting(app, 'unprotected_regex', delete=True) + app_setting(app, 'protected_regex', delete=True) permission_sync_to_user()