locked(): Suppose we try to touch() the lock file, but we don't own

it, and in fact our alter-ego owns the file (e.g. the cgi process or
shell account uid if we're mail).  The utime() call will fail with an
EPERM which wasn't being caught.  Catch it here and return 0 since we
obviously don't own the lock.

TBD: should other calls to __touch() be similarly wrapped?

1 files changed, 9 insertions, 1 deletions

diff --git a/Mailman/LockFile.py b/Mailman/LockFile.py
index 39b1cd1c7..60b9d8e4d 100644
--- a/Mailman/LockFile.py
+++ b/Mailman/LockFile.py
@@ -311,7 +311,15 @@ class LockFile:
         helps avoid race conditions during the lock status test.
         """
         # Discourage breaking the lock for a while.
-        self.__touch()
+        try:
+            self.__touch()
+        except OSError, e:
+            if e.errno == errno.EPERM:
+                # We can't touch the file because we're not the owner.  I
+                # don't see how we can own the lock if we're not the owner.
+                return 0
+            else:
+                raise
         # TBD: can the link count ever be > 2?
         if self.__linkcount() <> 2:
             return 0