Rev 177: Fixed bug #133764. in http://bzr.daniel-watkins.co.uk/pqm/133764

[Daniel Watkins]

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

------------------------------------------------------------
revno: 177
revision-id: daniel at daniel-watkins.co.uk-20080715133515-8y0kjhirylphjeoa
parent: robertc at robertcollins.net-20080710074340-dl0w25nbutl88sz2
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 133764
timestamp: Tue 2008-07-15 14:35:15 +0100
message:
  Fixed bug #133764.
-------------- next part --------------
=== modified file 'bin/pqm'
--- a/bin/pqm	2007-09-20 23:03:38 +0000
+++ b/bin/pqm	2008-07-15 13:35:15 +0000
@@ -107,13 +107,13 @@
     # FIXME: This is currently extremely hard to test. move it to the library,
     # and test it!
     try:
+        success = False
         try:
             logger.info('trying script ' + script.filename)
             logname = os.path.join(logdir, os.path.basename(script.filename) + '.log')
             (sender, subject, msg, sig) = read_email(logger, open(script.filename))
             if verify_sigs:
                 sigid,siguid = verify_sig(script.getSender(), msg, sig, 0, logger)
-            success = False
             output = []
             failedcmd=None
     
@@ -144,16 +144,16 @@
             # catch all to ensure we get some output in uncaught failures
             output = [str(e)]
             raise
+        if mail_reply:
+            send_mail_reply(success, successes, unrecognized,
+                            mail_server, from_address, script.getSender(),
+                            fromaddr, failedcmd, output, script)
+        else:
+            logger.info('not sending mail reply')
     finally:
         # ensure we always unlink the script file.
         log_list(logname, output)
         os.unlink(script.filename)
-    if mail_reply:
-        send_mail_reply(success, successes, unrecognized,
-                        mail_server, from_address, script.getSender(),
-                        fromaddr, failedcmd, output, script)
-    else:
-        logger.info('not sending mail reply')
 
 def send_mail_reply(success, successes, unrecognized, mail_server, from_address, sender, fromaddr, failedcmd, output, script):
     if success: