From 9300e296e3104ffe6753a8f5bc0daf5d0d371d66 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 4 Sep 2013 10:43:54 +0200 Subject: [PATCH] =?UTF-8?q?[gen=5Fconf]=20Envois=20du=20mail=20de=20bienve?= =?UTF-8?q?nue,=20v=C3=A9rification=20de=20la=20cr=C3=A9ation=20du=20home?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La portion de code qui l'effectué auparavant ne fonctionait qu'avec des adresses crans sans le @crans.org cf http://git.crans.org/usr-scripts/7eb1a80889ceaa et suivant. --- gestion/gen_confs/adherents.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gestion/gen_confs/adherents.py b/gestion/gen_confs/adherents.py index f279ae65..8b88b110 100644 --- a/gestion/gen_confs/adherents.py +++ b/gestion/gen_confs/adherents.py @@ -167,11 +167,10 @@ class mail_bienvenue: try: From = "respbats@crans.org" To = mail - if '@' not in To: - if not os.path.exists("/home/" + To): + if '@crans.org' in To: + if not os.path.exists("/home/" + To.replace('@crans.org','')): + print ERREUR continue - else: - To += '@crans.org' conn=smtplib.SMTP('localhost') conn.sendmail(From, To, mail_module.generate('bienvenue', { 'From': From, 'To': To, 'lang_info': 'English version below' }).as_string()) conn.quit()