Rev 180: Switched 'run' and 'do_run_mode' in the pqm script to use the global logger. in http://bzr.daniel-watkins.co.uk/pqm/logging

[Daniel Watkins]

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

------------------------------------------------------------
revno: 180
revision-id: daniel at daniel-watkins.co.uk-20080708051906-2cclabqtjhczm15t
parent: d.m.watkins at warwick.ac.uk-20080702013313-tpow1un410t1ihlr
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: logging
timestamp: Tue 2008-07-08 06:19:06 +0100
message:
  Switched 'run' and 'do_run_mode' in the pqm script to use the global logger.
-------------- next part --------------
=== modified file 'bin/pqm'
--- a/bin/pqm	2007-09-20 23:03:38 +0000
+++ b/bin/pqm	2008-07-08 05:19:06 +0000
@@ -83,7 +83,7 @@
         raise PQMTlaFailure(sender, ["VCS command %s %s failed (%s): %s" % (cmd, args, status, msg)] + output)
     return output
 
-def do_run_mode(queuedir, logger, logdir, mail_reply, mail_server, from_address, fromaddr, print_report):
+def do_run_mode(queuedir, logdir, mail_reply, mail_server, from_address, fromaddr, print_report):
     scripts = find_patches(queuedir, logger, verify_sigs, rev_optionhandler, configp)
     (goodscripts, badscripts) = ([], [])
     for script in scripts:
@@ -193,12 +193,12 @@
         f.write(l)
     f.close()
 
-def run(pqm_subdir, run_mode, queuedir, logger, logdir, mail_reply, mail_server, from_address, fromaddr, print_report):
+def run(pqm_subdir, run_mode, queuedir, logdir, mail_reply, mail_server, from_address, fromaddr, print_report):
     lockfile=LockFile(os.path.join(pqm_subdir, 'pqm.lock'), logger, pqm.no_act, cron_mode)
     lockfile.acquire()
     try:
         if run_mode:
-            do_run_mode(queuedir, logger, logdir, mail_reply, mail_server, from_address, fromaddr, print_report)
+            do_run_mode(queuedir, logdir, mail_reply, mail_server, from_address, fromaddr, print_report)
     finally:
         lockfile.release()
         
@@ -432,7 +432,7 @@
 
 assert(run_mode)
 
-run(pqm_subdir, run_mode, queuedir, logger, logdir, mail_reply, mail_server, from_address, fromaddr, print_report)
+run(pqm_subdir, run_mode, queuedir, logdir, mail_reply, mail_server, from_address, fromaddr, print_report)
 logger.info("main thread exiting...")
 sys.exit(0)