darcs-hash:20041019171657-d1718-063a48a144011cfaf1500d131fcbb95ae92b6a15.gz
This commit is contained in:
bernat 2004-10-19 19:16:57 +02:00
parent c770fee0cc
commit 5f8c3ad3af

View file

@ -894,20 +894,19 @@ def set_machine(machine) :
try : machine.mac(result[1]) try : machine.mac(result[1])
except ValueError, c : except ValueError, c :
if len(c.args)>1: if len(c.args)>1 and c.args[1] == 1 and isadm:
if c.args[1] == 1 and isadm : # Mac en double
# Mac en double arg = u'--title "Adresse MAC" '
arg = u'--title "Adresse MAC" ' arg+= u'--yesno "L\'adresse MAC existe déja, continuer ? \n" 0 0'
arg+= u'--yesno "L\'adresse MAC existe déja, continuer ? \n" 0 0' no, res = dialog(arg)
no, res = dialog(arg) if no :
if no : return set_machine(machine)
return set_machine(machine) else :
else : try : machine.mac(result[1],1)
try : machine.mac(result[1],1) except ValueError, c : err += c.args[0] + '\n'
except ValueError, c : err += c.args[0] + '\n' except EnvironmentError, c : err += c.args[0] + '\n'
except EnvironmentError, c : err += c.args[0] + '\n' else:
else: err += c.args[0] + '\n'
err += c.args[0] + '\n'
except EnvironmentError, c : err += c.args[0] + '\n' except EnvironmentError, c : err += c.args[0] + '\n'