From 00d67f1fc3deb43879d53ec2aad0040a52cb0fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sun, 30 Aug 2015 14:42:30 +0200
Subject: [PATCH] adher.delete peut raise, donc on utilise un bloc try

---
 gestion/gest_crans.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gestion/gest_crans.py b/gestion/gest_crans.py
index 5a11268e..a93bce6f 100755
--- a/gestion/gest_crans.py
+++ b/gestion/gest_crans.py
@@ -794,7 +794,13 @@ def del_adher(adher):
         arg += u'--msgbox "Le commentaire est obligatoire\n\n\n" 0 0'
         dialog(arg)
 
-    adher.delete(res[0])
+    try:
+        adher.delete(res[0])
+    except EnvironmentError, c:
+        arg = u'--title "Destruction du compte" '
+        arg += u'--msgbox "%s\n\n\n" 0 0' % to_unicode(c.args[0])
+        dialog(arg)
+        return
 
     arg = u'--title "Destruction adhérent" '
     arg += u'--msgbox "Adhérent détruit\n\n\n" 0 0'
@@ -2264,13 +2270,15 @@ def modif_adher(adher):
                 arg += u'--msgbox "Vous n\'avez pas les droits necessaires pour effectuer cette opération.\n\n\n" 0 0'
                 dialog(arg)
                 return modif_adher(adher)
+
             arg = u'--title "Départ de %s" ' % adher.Nom()
             arg += u'--yesno "Le départ du campus de %s va provoquer la destruction de son compte.\n' % adher.Nom()
             arg += u'\nDoit-on continuer ?" 0 0'
             no, res = dialog(arg)
-            if no: return modif_adher(adher)
-            for m in adher.machines():
-                m.delete("Depart du campus")
+
+            if no:
+                return modif_adher(adher)
+
             try:
                 adher.delete("Depart du campus")
             except EnvironmentError, c: