X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=825539f27260f391592ea313e2d8279e37fb0ed2;hb=0ed9392369f359540617699cac4289a30e3fbb10;hp=6484f48a7a5c014a1ea0118ac26ff6b5d6ca60a3;hpb=865d6fa233ccec8ed4671d991f342dd60c99038f;p=nodemanager.git 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):