bbohard/CD73
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

suppression contrecarrée

Browse Source
This commit is contained in:
Benjamin Bohard
2025-08-20 11:38:27 +02:00
parent dd65af21ad
commit 32f21c0f34
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches.d/scribe-backend.patch
View File

@ -1,5 +1,5 @@
diff --git usr/bin/importation_scribe usr/bin/importation_scribe 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
+++ usr/bin/importation_scribe +++ usr/bin/importation_scribe
@@ -42,21 +42,22 @@ choix de la source de données et imports @@ -42,21 +42,22 @@ choix de la source de données et imports
@ -26,7 +26,7 @@ index 0db4982..233c691 100755
class OutOfRange(Exception): class OutOfRange(Exception):
""" Exception OutOfRange """ """ Exception OutOfRange """
@@ -458,33 +459,45 @@ class Console: @@ -458,33 +459,46 @@ class Console:
""" """
log.add_lock() log.add_lock()
log.debuglog("Arrêt de LSC...", title=True) log.debuglog("Arrêt de LSC...", title=True)
@ -57,6 +57,7 @@ index 0db4982..233c691 100755
etab=etab) etab=etab)
+ if SUPPORT_ETAB and self.import_type == 'annu': + if SUPPORT_ETAB and self.import_type == 'annu':
+ user = User() + user = User()
+ user.has_ftp = True
+ user.ldap_admin = connexion + user.ldap_admin = connexion
+ obsolete_logins = [login[1]['uid'][0] for login in old_logins if login[1]['uid'] not in logins] + obsolete_logins = [login[1]['uid'][0] for login in old_logins if login[1]['uid'] not in logins]
+ for obsolete_login in obsolete_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) res = self.ldap_admin._search("(&%s%s)" % (USER_FILTER, filtre), attrs)
for user in res: for user in res:
diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py 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
+++ 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 = Group()
grp.ldap_admin = self.ldap_admin grp.ldap_admin = self.ldap_admin
if touch: if touch:
@ -252,7 +253,6 @@ index 05569fd..fb4757f 100644
+ self._desinscription(user, etab, sync=False) + self._desinscription(user, etab, sync=False)
+ for grp in self._get_user_groups(user, etab): + for grp in self._get_user_groups(user, etab):
+ self._desinscription(user, grp, sync=False) + self._desinscription(user, grp, sync=False)
+ self._desinscription(user, etab, sync=False)
+ +
def _gen_ftpdir(self, login): def _gen_ftpdir(self, login):
""" """
@ -264,7 +264,7 @@ index 05569fd..fb4757f 100644
rmtree(ftpdir) rmtree(ftpdir)
makedirs(ftpdir, 0o500) makedirs(ftpdir, 0o500)
system('/bin/chown %s %s' % (login, ftpdir)) 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, authldap = Ldap(binddn=user_dn,
passwd=password) passwd=password)
try: try: