From 34d5cbf83819f464d365ec7ecb731f94771bf446 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Mon, 10 Jun 2013 14:35:21 -0700
Subject: - Fixed bin/mailmanctl -s to not remove the master lock if it can't
 be   determined to be truly stale.  (LP: #1189558)

---
 bin/mailmanctl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin')

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()
-- 
cgit v1.2.3