# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-09-29 17:28:52
# Node ID 6d7db5794e8cad7da042b6ae6238116c6e59a4d2
# Parent  a41fd730f2305410e3f03f2f8400d66f2c9da0fe
# Parent  829919ef894acb189c8ec0431e59f36338eb038f

merge with stable

diff --git a/mercurial/lock.py b/mercurial/lock.py
--- a/mercurial/lock.py
+++ b/mercurial/lock.py
@@ -97,7 +97,12 @@ class lock(object):
         The lock file is only deleted when None is returned.
 
         """
-        locker = util.readlock(self.f)
+        try:
+            locker = util.readlock(self.f)
+        except OSError, why:
+            if why.errno == errno.ENOENT:
+                return None
+            raise
         try:
             host, pid = locker.split(":", 1)
         except ValueError: