- Fixed bin/mailmanctl -s to not remove the master lock if it can't be

  determined to be truly stale.  (LP: #1189558)

2 files changed, 6 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 15e77e9b..5f34ba39 100755
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - Fixed bin/mailmanctl -s to not remove the master lock if it can't be
+      determined to be truly stale.  (LP: #1189558)
+
     - It is no longer possible to add 'invalid' addresses to the ban_list
       and the *_these_nonmembers filters from the check boxes on the admindb
       interface.  (LP: #1187201)
diff --git a/bin/mailmanctl b/bin/mailmanctl
index 9330cfa8..fa14a2cd 100644
--- a/bin/mailmanctl
+++ b/bin/mailmanctl
@@ -1,6 +1,6 @@
 #! @PYTHON@
 
-# Copyright (C) 2001-2012 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -199,7 +199,8 @@ def acquire_lock_1(force):
         lock.lock(0.1)
         return lock
     except LockFile.TimeOutError:
-        if not force:
+        # If we're not forcing or the lock can't be determined to be stale.
+        if not force or qrunner_state():
             raise
         # Force removal of lock first
         lock._disown()