summaryrefslogtreecommitdiff
path: root/Mailman/bin/mailmanctl.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/bin/mailmanctl.py')
-rw-r--r--Mailman/bin/mailmanctl.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mailman/bin/mailmanctl.py b/Mailman/bin/mailmanctl.py
index f6190f685..07716029b 100644
--- a/Mailman/bin/mailmanctl.py
+++ b/Mailman/bin/mailmanctl.py
@@ -27,9 +27,9 @@ import optparse
from Mailman import Defaults
from Mailman import Errors
-from Mailman import LockFile
from Mailman import Utils
from Mailman import Version
+from Mailman import lockfile
from Mailman import loginit
from Mailman.configuration import config
from Mailman.i18n import _
@@ -197,11 +197,11 @@ def qrunner_state():
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
# other master qrunner daemon is already going.
- lock = LockFile.LockFile(config.LOCK_FILE, LOCK_LIFETIME)
+ lock = lockfile.LockFile(config.LOCK_FILE, LOCK_LIFETIME)
try:
lock.lock(0.1)
return lock
- except LockFile.TimeOutError:
+ except lockfile.TimeOutError:
if not force:
raise
# Force removal of lock first
@@ -216,7 +216,7 @@ def acquire_lock(force):
try:
lock = acquire_lock_1(force)
return lock
- except LockFile.TimeOutError:
+ except lockfile.TimeOutError:
status = qrunner_state()
if status == 1:
# host matches and proc exists