From a352530aaae05b4231113ae47b08b1ffb0b6386e Mon Sep 17 00:00:00 2001 From: bernat Date: Mon, 8 Nov 2004 21:36:07 +0100 Subject: [PATCH] S'assurer que la machine existe. darcs-hash:20041108203607-d1718-1bceb579b6f139ccb05df9e111136ff97ca180e7.gz --- gestion/gen_confs/generate.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index a8c22828..8f511eca 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -265,11 +265,13 @@ To: %(To)s Subject: Modifications sur une machine du CR@NS %(Texte)s""" - machine = db.search('ipHostNumber=%s' % ip)['machine'][0] - conn=smtplib.SMTP(smtpserv) - conn.sendmail(From, To , base_txt_mail % { 'From' : From, 'To' : To, 'Texte' : machine_details(machine).encode('iso8859-15') }) - conn.quit() - print OK + machine = db.search('ipHostNumber=%s' % ip)['machine'] + if len(machine): + machine = machine[0] + conn=smtplib.SMTP(smtpserv) + conn.sendmail(From, To , base_txt_mail % { 'From' : From, 'To' : To, 'Texte' : machine_details(machine).encode('iso8859-15') }) + conn.quit() + print OK except Exception, c: print ERREUR if auto : db.services_to_restart('mail_modification_machine',[ip])