From a4afcf1b1ca9e4ba41860654cc8cdff88bfcaa7e Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Wed, 24 Jul 2002 18:50:24 +0000
Subject: acquire_lock_1(): Fix for bug # 565917 by Dale Stimson.  The tempfile
 needs to be prepended with the LOCK_DIR otherwise the unlink will fail.

Also fixed a typo in the docstring.
---
 bin/mailmanctl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mailmanctl b/bin/mailmanctl
index 016deae5e..7a6dc9aa2 100644
--- a/bin/mailmanctl
+++ b/bin/mailmanctl
@@ -59,7 +59,7 @@ Options:
 
     -s/--stale-lock-cleanup
         If mailmanctl finds an existing master qrunner lock, it will normally
-        exit with an error message.  With this optionn, mailmanctl will perform
+        exit with an error message.  With this option, mailmanctl will perform
         an extra level of checking.  If a process matching the host/pid
         described in the lock file is running, mailmanctl will still exit, but
         if no matching process is found, mailmanctl will remove the apparently
@@ -193,7 +193,7 @@ def acquire_lock_1(force):
         lock._disown()
         hostname, pid, tempfile = get_lock_data()
         os.unlink(LOCKFILE)
-        os.unlink(tempfile)
+        os.unlink(os.path.join(mm_cfg.LOCK_DIR, tempfile))
         return acquire_lock_1(force=0)
 
 
-- 
cgit v1.3.1