Rev 172: Make sure variables are initialized. in file:///home/jelmer/bzr/pqm/

Jelmer Vernooij jelmer at samba.org
Thu May 31 10:42:32 BST 2007


At file:///home/jelmer/bzr/pqm/

------------------------------------------------------------
revno: 172
revision-id: jelmer at samba.org-20070531094229-51qxpori0z9p3ysg
parent: jelmer at samba.org-20070522221228-cbroxbarxszl4dry
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pqm
timestamp: Thu 2007-05-31 11:42:29 +0200
message:
  Make sure variables are initialized.
modified:
  bin/pqm                        i_Simple_patch_queue_manager_for_tla
=== modified file 'bin/pqm'
--- a/bin/pqm	2006-03-21 20:12:17 +0000
+++ b/bin/pqm	2007-05-31 09:42:29 +0000
@@ -105,6 +105,11 @@
                    mail_reply, mail_server, from_address, fromaddr):
     # FIXME: This is currently extremely hard to test. move it to the library,
     # and test it!
+    success = False
+    successes = []
+    unrecognized = []
+    failedcmd = None
+    output = []
     try:
         try:
             logger.info('trying script ' + script.filename)
@@ -112,9 +117,6 @@
             (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
     
             # ugly transitional code
             pqm.logger = logger
@@ -132,13 +134,9 @@
             successes = e.goodcmds
             failedcmd = e.badcmd
             output = e.output
-            unrecognized=[]
         except PQMException, e:
             badscripts.append((script.filename, logname))
-            successes = []
-            failedcmd = []
             output = [str(e)]
-            unrecognized=[]
         except Exception, e:
             # catch all to ensure we get some output in uncaught failures
             output = [str(e)]




More information about the bazaar-commits mailing list