From 22e397f71c248d73a913d867cc04c0ef54409190 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 1 Apr 2021 20:12:17 +0200
Subject: [PATCH] Fix oopsies

---
 .../0019_extend_permissions_features.py        | 18 +++++++++---------
 .../0020_ssh_sftp_permissions.py               |  4 ++--
 src/yunohost/tools.py                          |  5 ++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/yunohost/data_migrations/0019_extend_permissions_features.py b/src/yunohost/data_migrations/0019_extend_permissions_features.py
index 30ae01ae4..d5e852701 100644
--- a/src/yunohost/data_migrations/0019_extend_permissions_features.py
+++ b/src/yunohost/data_migrations/0019_extend_permissions_features.py
@@ -17,6 +17,15 @@ class MyMigration(Migration):
     Add protected attribute in LDAP permission
     """
 
+    @Migration.ldap_migration
+    def run(self, backup_folder):
+
+        # Update LDAP database
+        self.add_new_ldap_attributes()
+
+        # Migrate old settings
+        migrate_legacy_permission_settings()
+
     def add_new_ldap_attributes(self):
 
         from yunohost.utils.ldap import _get_ldap_interface
@@ -75,12 +84,3 @@ class MyMigration(Migration):
                     }
 
             ldap.update("cn=%s,ou=permission" % permission, update)
-
-    @ldap_migration
-    def run(self, backup_folder):
-
-        # Update LDAP database
-        self.add_new_ldap_attributes()
-
-        # Migrate old settings
-        migrate_legacy_permission_settings()
diff --git a/src/yunohost/data_migrations/0020_ssh_sftp_permissions.py b/src/yunohost/data_migrations/0020_ssh_sftp_permissions.py
index 18c00d25e..d3368e4a0 100644
--- a/src/yunohost/data_migrations/0020_ssh_sftp_permissions.py
+++ b/src/yunohost/data_migrations/0020_ssh_sftp_permissions.py
@@ -5,7 +5,7 @@ from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import read_yaml
 
 from yunohost.tools import Migration
-from yunohost.permission import user_permission_update
+from yunohost.permission import user_permission_update, permission_sync_to_user
 
 logger = getActionLogger('yunohost.migration')
 
@@ -21,7 +21,7 @@ class MyMigration(Migration):
 
     dependencies = ["extend_permissions_features"]
 
-    @ldap_migration
+    @Migration.ldap_migration
     def run(self, *args):
 
         from yunohost.utils.ldap import _get_ldap_interface
diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index a33460c39..92c5982fd 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -28,6 +28,7 @@ import os
 import yaml
 import subprocess
 import pwd
+import time
 from importlib import import_module
 
 from moulinette import msignals, m18n
@@ -1144,7 +1145,7 @@ class Migration(object):
                 os.system(f"cp -r --preserve /etc/yunohost/apps {backup_folder}/apps_settings")
             except Exception as e:
                 raise YunohostError(
-                    "migration_ldap_can_not_backup_before_migration", error=e
+                    "migration_ldap_can_not_backup_before_migration", error=str(e)
                 )
             finally:
                 os.system("systemctl start slapd")
@@ -1165,3 +1166,5 @@ class Migration(object):
                 raise
             else:
                 os.system(f"rm -r {backup_folder}")
+
+        return func