From c770fee0ccf05b4cd3bc79b7c627d28383b82a8c Mon Sep 17 00:00:00 2001 From: bernat Date: Tue, 19 Oct 2004 19:13:58 +0200 Subject: [PATCH] On interdit les ponts rseau darcs-hash:20041019171358-d1718-1ef041612904666f438fcb8bd4201dcd8bbbd940.gz --- gestion/gest_crans.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gestion/gest_crans.py b/gestion/gest_crans.py index cebe0384..4eb96b63 100755 --- a/gestion/gest_crans.py +++ b/gestion/gest_crans.py @@ -894,19 +894,21 @@ def set_machine(machine) : try : machine.mac(result[1]) except ValueError, c : - if len(c.args)>1 and isadm : - # Mac en double - arg = u'--title "Adresse MAC" ' - arg+= u'--yesno "L\'adresse MAC existe déja, continuer ? \n" 0 0' - no, res = dialog(arg) - if no : - return set_machine(machine) - else : - try : machine.mac(result[1],1) - except ValueError, c : err += c.args[0] + '\n' - except EnvironmentError, c : err += c.args[0] + '\n' - else : - err += c.args[0] + '\n' + if len(c.args)>1: + if c.args[1] == 1 and isadm : + # Mac en double + arg = u'--title "Adresse MAC" ' + arg+= u'--yesno "L\'adresse MAC existe déja, continuer ? \n" 0 0' + no, res = dialog(arg) + if no : + return set_machine(machine) + else : + try : machine.mac(result[1],1) + except ValueError, c : err += c.args[0] + '\n' + except EnvironmentError, c : err += c.args[0] + '\n' + else: + err += c.args[0] + '\n' + except EnvironmentError, c : err += c.args[0] + '\n' try : machine.ip(result[2])