Skip to content
Snippets Groups Projects
Commit 6d7db5794e8c authored by Matt Mackall's avatar Matt Mackall
Browse files

merge with stable

No related branches found
No related tags found
No related merge requests found
......@@ -97,7 +97,12 @@
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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment