Rev 218: Fixed failing test. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

------------------------------------------------------------
revno: 218
revision-id: daniel at daniel-watkins.co.uk-20080801025304-rx0yk3188wzcj1in
parent: daniel at daniel-watkins.co.uk-20080801025027-ydo2e62ewtnk3eyz
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc-validation
timestamp: Fri 2008-08-01 03:53:04 +0100
message:
  Fixed failing test.
-------------- next part --------------
=== modified file 'pqm/ui/xmlrpc.py'
--- a/pqm/ui/xmlrpc.py	2008-08-01 02:10:25 +0000
+++ b/pqm/ui/xmlrpc.py	2008-08-01 02:53:04 +0000
@@ -23,7 +23,7 @@
 from twisted.web.xmlrpc import XMLRPC
 
 import pqm
-from pqm.errors import PQMException
+from pqm.errors import PQMCmdFailure, PQMException
 from pqm.script import Command, get_email_string, read_email_from_string
 from pqm.ui.twistd import FakeOptions
 
@@ -64,7 +64,10 @@
             # Process input
             email = read_email_from_string(self.logger, text)
             email_string = get_email_string(self.logger, options, email)
-            self.validate(email_string)
+            try:
+                self.validate(email_string)
+            except PQMCmdFailure, e:
+                return '\n'.join(e.output)
             # Write script
             pqm.write_script(queuedir, email_string)
             return "Success!"