From 6b0be7b838737086e59c2c49c0c77913e4602f85 Mon Sep 17 00:00:00 2001 From: pauget Date: Sun, 17 Oct 2004 02:07:57 +0200 Subject: [PATCH] Expliciation de quelle blackliste st modifie dans les historiques. darcs-hash:20041017000757-41617-66812edaa9336fe93577a07e3e5242dd3a11daeb.gz --- gestion/ldap_crans.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index a0733d10..d023d7c0 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -685,16 +685,18 @@ class base_classes_crans(crans_ldap) : try : time.strptime(new[1],date_format) except : raise ValueError(u'Date de fin blacklist invalide') - new = ','.join(new) - new = preattr(new)[1] + new_c = ','.join(new) + new_c = preattr(new_c)[1] if index!=-1 : - liste[index] = new + liste[index] = new_c else : - liste = liste + [ new ] + liste = liste + [ new_c ] - self._set('blacklist',liste) - + if self._data['blacklist'] != liste : + self._data['blacklist']=liste + self.modifs.append('blacklist_' + new[2]) + return liste def restore(self) : @@ -838,12 +840,11 @@ class base_classes_crans(crans_ldap) : 'hostAlias' : [ 'dns' ] , 'droits' : [ 'droits' ] , 'ports' : [ 'firewall-komaz' ] , - 'blacklist' : [ 'blacklistes' ] , } serv = [] for m in self.modifs : - for s in annuaire_modif_service.get(m,[]) : + for s in annuaire_modif_service.get(m,[m]) : if s not in serv : serv.append(s)