- 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, 37 insertions, 32 deletions

diff --git a/ipa-admintools/ipa-listdelegation b/ipa-admintools/ipa-listdelegation
index 6a718dec..217b16dd 100644
--- a/ipa-admintools/ipa-listdelegation
+++ b/ipa-admintools/ipa-listdelegation
@@ -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 operator
-import xmlrpclib
-import kerberos
-import errno
-
-import ipa.aci
-from ipa import ipaerror
-
 aci_fields = ['*', 'aci']
 def usage():
     print "ipa-listdelgation"
@@ -54,23 +41,7 @@ def main():
         usage()
 
     client = ipaclient.IPAClient()
-    try:
-        aci_entry = client.get_aci_entry(aci_fields)
-    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 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 ipaerror.IPAError, e:
-        print("Delegation list failed: " + str(e))
-        return 1
+    aci_entry = client.get_aci_entry(aci_fields)
 
     aci_str_list = aci_entry.getValues('aci')
     if aci_str_list is None:
@@ -102,5 +73,39 @@ def main():
 
     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 operator
+    import xmlrpclib
+    import kerberos
+    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 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 ipaerror.IPAError, e:
+    print("Delegation list failed: " + str(e))
+    sys.exit(1)