- Centralize try/except so the entire program is covered. This make it

  possible to catch KeyboardInterrupt during the import process.
- Add function for handling python differences with GSSError

434798

1 files changed, 70 insertions, 65 deletions

diff --git a/ipa-admintools/ipa-deldelegation b/ipa-admintools/ipa-deldelegation
index 07613d56..ac0ae798 100644
--- a/ipa-admintools/ipa-deldelegation
+++ b/ipa-admintools/ipa-deldelegation
@@ -18,19 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #   
 
-import sys
-from optparse import OptionParser
-import ipa.ipaclient as ipaclient
-import ipa.config
-
-import xmlrpclib
-import kerberos
-import copy
-import errno
-
-import ipa.aci
-from ipa import ipaerror
-
 aci_fields = ['*', 'aci']
 
 def usage():
@@ -55,58 +42,76 @@ def main():
         usage()
 
     client = ipaclient.IPAClient()
-    try:
-        aci_entry = client.get_aci_entry(aci_fields)
-
-        aci_str_list = aci_entry.getValues('aci')
-        if aci_str_list is None:
-            aci_str_list = []
-        if not(isinstance(aci_str_list,list) or isinstance(aci_str_list,tuple)):
-            aci_str_list = [aci_str_list]
-
-        acistr = None
-        for aci_str in aci_str_list:
-            try:
-                aci = ipa.aci.ACI(aci_str)
-                if aci.name == args[1]:
-                    acistr = aci_str
-                    break
-            except SyntaxError:
-                # ignore aci_str's that ACI can't parse
-                pass
-
-        if acistr is None:
-            print "No delegation '%s' found." % args[1]
-            return 2
-
-        old_aci_index = aci_str_list.index(acistr)
-
-        new_aci_str_list = copy.deepcopy(aci_str_list)
-        del new_aci_str_list[old_aci_index]
-        aci_entry.setValue('aci', new_aci_str_list)
-
-        client.update_entry(aci_entry)
-        print "Delegation removed."
-    except xmlrpclib.Fault, fault:
-        if fault.faultCode == errno.ECONNREFUSED:
-            print "The IPA XML-RPC service is not responding."
-        else:
-            print fault.faultString
-        return 1
-    except (SyntaxError, ipaerror.IPAError), e:
-        print "Delegation deletion failed: " + str(e)
-        return 1
-    except kerberos.GSSError, e:
-        print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0])
-        return 1
-    except xmlrpclib.ProtocolError, e:
-        print "Unable to connect to IPA server: %s" % (e.errmsg)
-        return 1
-    except ipa.ipaerror.IPAError, e:
-        print "%s" % (e.message)
-        return 1
+    aci_entry = client.get_aci_entry(aci_fields)
+
+    aci_str_list = aci_entry.getValues('aci')
+    if aci_str_list is None:
+        aci_str_list = []
+    if not(isinstance(aci_str_list,list) or isinstance(aci_str_list,tuple)):
+        aci_str_list = [aci_str_list]
+
+    acistr = None
+    for aci_str in aci_str_list:
+        try:
+            aci = ipa.aci.ACI(aci_str)
+            if aci.name == args[1]:
+                acistr = aci_str
+                break
+        except SyntaxError:
+            # ignore aci_str's that ACI can't parse
+            pass
+
+    if acistr is None:
+        print "No delegation '%s' found." % args[1]
+        return 2
+
+    old_aci_index = aci_str_list.index(acistr)
+
+    new_aci_str_list = copy.deepcopy(aci_str_list)
+    del new_aci_str_list[old_aci_index]
+    aci_entry.setValue('aci', new_aci_str_list)
+
+    client.update_entry(aci_entry)
+    print "Delegation removed."
 
     return 0
 
-if __name__ == "__main__":
-    sys.exit(main())
+try:
+    import sys
+    from optparse import OptionParser
+    import ipa.ipaclient as ipaclient
+    import ipa.config
+    import ipa.ipautil as ipautil
+
+    import xmlrpclib
+    import kerberos
+    import copy
+    import errno
+
+    import ipa.aci
+    from ipa import ipaerror
+
+    if __name__ == "__main__":
+        sys.exit(main())
+except SystemExit, e:
+    sys.exit(e)
+except KeyboardInterrupt, e:
+    sys.exit(1)
+except xmlrpclib.Fault, fault:
+    if fault.faultCode == errno.ECONNREFUSED:
+        print "The IPA XML-RPC service is not responding."
+    else:
+        print fault.faultString
+    sys.exit(1)
+except (SyntaxError, ipaerror.IPAError), e:
+    print "Delegation deletion failed: " + str(e)
+    sys.exit(1)
+except kerberos.GSSError, e:
+    print "Could not initialize GSSAPI: %s/%s" % (ipautil.get_gsserror(e))
+    sys.exit(1)
+except xmlrpclib.ProtocolError, e:
+    print "Unable to connect to IPA server: %s" % (e.errmsg)
+    sys.exit(1)
+except ipa.ipaerror.IPAError, e:
+    print "%s" % (e.message)
+    sys.exit(1)