From 7691653c0a3ee95aab7c64d631c694a300547345 Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Wed, 22 Aug 2007 10:30:51 -0700 Subject: Create ipaerror module. Move LDAPError trapping/conversion into the ipaldap module. Fix xmlrpc layer to encode/decode ipaerrors properly. Also, implement mid-air collision exception for updates. --- ipa-server/xmlrpc-server/ipaxmlrpc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ipa-server/xmlrpc-server/ipaxmlrpc.py') diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 03340ca5..be4762c3 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -35,6 +35,8 @@ from mod_python import apache import ipaserver import funcs +from ipa import ipaerror + import string import base64 @@ -144,9 +146,9 @@ class ModXMLRPCRequestHandler(object): # wrap response in a singleton tuple response = (response,) response = dumps(response, methodresponse=1, allow_none=1) - except Fault, fault: + except ipaerror.IPAError, e: self.traceback = True - response = dumps(fault) + response = dumps(Fault(e.code, str(e))) except: self.traceback = True # report exception back to server -- cgit