From 32f21c0f3486a4b17e857dec54ece1e9a604e75c Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Wed, 20 Aug 2025 11:38:27 +0200
Subject: [PATCH] =?UTF-8?q?suppression=20contrecarr=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 patches.d/scribe-backend.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches.d/scribe-backend.patch b/patches.d/scribe-backend.patch
index 9cae2e1..b88658a 100644
--- a/patches.d/scribe-backend.patch
+++ b/patches.d/scribe-backend.patch
@@ -1,5 +1,5 @@
 diff --git usr/bin/importation_scribe usr/bin/importation_scribe
-index 0db4982..233c691 100755
+index 0db4982..1257b32 100755
 --- usr/bin/importation_scribe
 +++ usr/bin/importation_scribe
 @@ -42,21 +42,22 @@ choix de la source de données et imports
@@ -26,7 +26,7 @@ index 0db4982..233c691 100755
  
  class OutOfRange(Exception):
      """ Exception OutOfRange """
-@@ -458,33 +459,45 @@ class Console:
+@@ -458,33 +459,46 @@ class Console:
          """
          log.add_lock()
          log.debuglog("Arrêt de LSC...", title=True)
@@ -57,6 +57,7 @@ index 0db4982..233c691 100755
                                  etab=etab)
 +        if SUPPORT_ETAB and self.import_type == 'annu':
 +            user = User()
++            user.has_ftp = True
 +            user.ldap_admin = connexion
 +            obsolete_logins = [login[1]['uid'][0] for login in old_logins if login[1]['uid'] not in logins]
 +            for obsolete_login in obsolete_logins:
@@ -234,10 +235,10 @@ index 45ec338..9a67c6d 100644
          res = self.ldap_admin._search("(&%s%s)" % (USER_FILTER, filtre), attrs)
          for user in res:
 diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py
-index 05569fd..fb4757f 100644
+index 05569fd..c092698 100644
 --- usr/lib/python3/dist-packages/scribe/eoleuser.py
 +++ usr/lib/python3/dist-packages/scribe/eoleuser.py
-@@ -410,20 +410,26 @@ class User(LdapEntry):
+@@ -410,20 +410,25 @@ class User(LdapEntry):
          grp = Group()
          grp.ldap_admin = self.ldap_admin
          if touch:
@@ -252,7 +253,6 @@ index 05569fd..fb4757f 100644
 +        self._desinscription(user, etab, sync=False)
 +        for grp in self._get_user_groups(user, etab):
 +            self._desinscription(user, grp, sync=False)
-+        self._desinscription(user, etab, sync=False)
 +
      def _gen_ftpdir(self, login):
          """
@@ -264,7 +264,7 @@ index 05569fd..fb4757f 100644
              rmtree(ftpdir)
          makedirs(ftpdir, 0o500)
          system('/bin/chown %s %s' % (login, ftpdir))
-@@ -594,27 +600,27 @@ class User(LdapEntry):
+@@ -594,27 +599,27 @@ class User(LdapEntry):
          authldap = Ldap(binddn=user_dn,
                          passwd=password)
          try: