Rev 176: Merged pqm.dev r183. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

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

------------------------------------------------------------
revno: 176
revision-id: daniel at daniel-watkins.co.uk-20080823204906-59oaayma1xecgh9z
parent: daniel at daniel-watkins.co.uk-20080717112716-16i7mbpru2u4g84p
parent: robertc at robertcollins.net-20080821050843-j8np05as8ti53ydl
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Sat 2008-08-23 21:49:06 +0100
message:
  Merged pqm.dev r183.
modified:
  bin/pqm                        i_Simple_patch_queue_manager_for_tla
    ------------------------------------------------------------
    revno: 159.7.9
    revision-id: robertc at robertcollins.net-20080821050843-j8np05as8ti53ydl
    parent: robertc at robertcollins.net-20080717100934-40fjde09nglggsub
    parent: daniel at daniel-watkins.co.uk-20080717115321-dv72rnk8zr696qzc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: public
    timestamp: Thu 2008-08-21 15:08:43 +1000
    message:
      Merge Daniel Watkins bugfix for bug 133764 - backtrace processing some mails.
    modified:
      bin/pqm                        i_Simple_patch_queue_manager_for_tla
      pqm/tests/test_pqm.py          x_Robert_Collins_<robert.collins at canonical.com>_Thu_Aug__4_22:52:41_2005_804.0
    ------------------------------------------------------------
    revno: 159.15.2
    revision-id: daniel at daniel-watkins.co.uk-20080717115321-dv72rnk8zr696qzc
    parent: daniel at daniel-watkins.co.uk-20080715133515-8y0kjhirylphjeoa
    parent: robertc at robertcollins.net-20080717100934-40fjde09nglggsub
    committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
    branch nick: 133764
    timestamp: Thu 2008-07-17 12:53:21 +0100
    message:
      Merged pqm.dev r182.
    added:
      pqm/commandline.py             commandline.py-20080416102158-op31dy0lnkeo91ww-1
      pqm/errors.py                  errors.py-20080528044209-lpacj0a0ub4woseh-1
      pqm/script.py                  script.py-20080528044209-lpacj0a0ub4woseh-2
      pqm/tests/test_commandline.py  test_commandline.py-20080416102209-p18w8m9sw21704j9-1
    modified:
      .bzrignore                     bzrignore-20060322120158-35e5bcdaf76b6fdf
      Makefile.am                    i_Automake_rules_for_toplevel_tla-pqm_directory
      bin/pqm                        i_Simple_patch_queue_manager_for_tla
      configure.ac                   i_Toplevel_Autoconf_configuration_script
      pqm/__init__.py                i_dc99ede3-0c64-434d-ac84-305c06455a8d
      pqm/tests/test_lockfile.py     test_lockfile.py-20060111035725-07e8b573302c8fef
      pqm/tests/test_pqm.py          x_Robert_Collins_<robert.collins at canonical.com>_Thu_Aug__4_22:52:41_2005_804.0
      pqm/ui/tests/test_twisted.py   x_Robert_Collins_<robert.collins at canonical.com>_Sat_Jul__9_22:36:13_2005_7873.0
      pqm/ui/twistd.py               x_Robert_Collins_<robert.collins at canonical.com>_Sun_Jul_10_02:00:08_2005_15556.0
    ------------------------------------------------------------
    revno: 159.15.1
    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.
    modified:
      bin/pqm                        i_Simple_patch_queue_manager_for_tla
-------------- next part --------------
=== modified file 'bin/pqm'
--- a/bin/pqm	2008-07-17 02:03:01 +0000
+++ b/bin/pqm	2008-07-17 11:53:21 +0000
@@ -101,6 +101,7 @@
     # 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')
@@ -108,7 +109,6 @@
             if options.verify_sigs:
                 sigid,siguid = verify_sig(
                     script.getSender(), msg, sig, 0, logger, options.keyring)
-            success = False
             output = []
             failedcmd=None
     
@@ -139,16 +139,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: