From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 1 Feb 2007 21:55:19 +0000 (+0000)
Subject: - raise an xmlrpclib.Fault on any exception while parsing/delivering ticket
X-Git-Tag: planetlab-4_0-rc1~14
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=0ed9392369f359540617699cac4289a30e3fbb10

- raise an xmlrpclib.Fault on any exception while parsing/delivering ticket
---

diff --git a/api.py b/api.py
index 6484f48..825539f 100644
--- a/api.py
+++ b/api.py
@@ -49,13 +49,12 @@ def Help():
 @export_to_api(1)
 def Ticket(tkt):
     """Ticket(tkt): deliver a ticket"""
-    succeeded = False
-    if type(tkt) == str:
+    try:
         data = ticket.verify(tkt)
         if data != None:
             deliver_ticket(data)
-            succeeded = True
-    if not succeeded: raise xmlrpclib.Fault(102, 'Invalid argument: the sole argument must be a valid ticket as returned from GetTicket().')
+    except Exception, err:
+        raise xmlrpclib.Fault(102, 'Ticket error: ' + str(err))
 
 @export_to_api(1)
 def Create(rec):