From ff07c408a3219affb69690d4d20d2d83db8cb3cd Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Tue, 19 Aug 2025 11:13:19 +0200 Subject: [PATCH] =?UTF-8?q?Plus=20de=20s=C3=A9gr=C3=A9gation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches.d/scribe-backend.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/patches.d/scribe-backend.patch b/patches.d/scribe-backend.patch index b1dfb97..2bc4180 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..4b84c5f 100755 +index 0db4982..47f5c80 100755 --- usr/bin/importation_scribe +++ usr/bin/importation_scribe @@ -42,21 +42,22 @@ choix de la source de données et imports @@ -15,7 +15,7 @@ index 0db4982..4b84c5f 100755 from scribe.eoleldap import Ldap -from scribe.ldapconf import SUPPORT_ETAB +from scribe.eoleuser import User -+from scribe.ldapconf import SUPPORT_ETAB, BRANCHE_ETAB, PROF_FILTER ++from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER from scribe.eoletools import nscd_start, nscd_stop from scribe.parsing import sconet, aaf, be1d, scribecsv2 from scribe.importation import preferences, writer, config @@ -26,7 +26,7 @@ index 0db4982..4b84c5f 100755 class OutOfRange(Exception): """ Exception OutOfRange """ -@@ -458,33 +459,45 @@ class Console: +@@ -458,33 +459,44 @@ class Console: """ log.add_lock() log.debuglog("Arrêt de LSC...", title=True) @@ -37,9 +37,8 @@ index 0db4982..4b84c5f 100755 prefs = preferences.get_enseignants_prefs() etab = prefs.get_default('etab') etab_prefix = prefs.get_default('etab_prefix') -+ branche_etab = BRANCHE_ETAB % {'etab': etab} + purge_option = 'keep' -+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid', suffix=branche_etab) ++ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid') + else: etab = None