------------------------------------------------------------
revno: 1254
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Mon 2013-06-10 14:38:27 -0700
message:
- Fixed bin/mailmanctl -s to not remove the master lock if it can't be
determined to be truly stale. (LP: #1189558)
modified:
NEWS
bin/mailmanctl
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'NEWS'
--- NEWS 2013-06-07 20:51:40 +0000
+++ NEWS 2013-06-10 21:38:27 +0000
@@ -105,6 +105,9 @@
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)
=== modified file 'bin/mailmanctl'
--- bin/mailmanctl 2012-11-24 20:18:30 +0000
+++ bin/mailmanctl 2013-06-10 21:38:27 +0000
@@ -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 @@
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()
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
