[crans] On cumule les erreurs

This commit is contained in:
Vincent Le Gallic 2013-09-12 10:33:07 +02:00
parent 6532f805ad
commit 5ce1dd11c2
9 changed files with 20 additions and 47 deletions

View file

@ -1523,7 +1523,10 @@ def set_machine(machine):
except ValueError, c: err += c.args[0] + '\n'
except EnvironmentError, c: err += c.args[0] + '\n'
else:
err += c.args[0] + '\n'
try:
err += c.args[0] + '\n'
except UnicodeDecodeError:
raise Exception("UnicodeDecodeError on %s" % repr(c.args))
except EnvironmentError, c: err += c.args[0] + '\n'
@ -1626,14 +1629,6 @@ def new_adher(adher):
if not confirm(adher): break
arg = u'--title "Inscription Mailing liste de communication ENS" --yesno "\nInscrire l\'adhérent à la mailing liste de communication de l\'ENS ?\n\n\n" 0 0'
no, res = dialog(arg)
if not no:
mail = adher.mail()
if adher._data.get('uid', '') != '' and not mail.endswith('@crans.org'):
mail += '@crans.org'
adher.services_to_restart('ML_ens', [mail])
def modif_adher(adher):
u"""
Modification de l'adhérent fourni (instance de adhérent)