diff options
| author | Jim Popovitch <jimpop@gmail.com> | 2013-11-17 01:56:29 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@gmail.com> | 2013-11-17 01:56:29 +0000 |
| commit | 06d15b0a9949652f696d19903cef2a235ff3a428 (patch) | |
| tree | 55a9c12de799cc056da986aafe3b8e66d0cbf94b /bin/mailmanctl | |
| parent | bc05ad4e81bd2ce9ec0f36e5112eadf607a49195 (diff) | |
| parent | ded18dda2b2f9ba00f8780b4eba6c398c5bff838 (diff) | |
| download | mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.tar.gz mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.tar.xz mailman2-06d15b0a9949652f696d19903cef2a235ff3a428.zip | |
Upstream changes
Diffstat (limited to 'bin/mailmanctl')
| -rw-r--r-- | bin/mailmanctl | 5 |
1 files changed, 3 insertions, 2 deletions
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() |