author | Matt Mackall <mpm@selenic.com> |
Sat, 29 Sep 2012 12:28:52 -0500 | |
changeset 17683 | 6d7db5794e8c |
parent 17681 | a41fd730f230 (current diff) |
parent 17682 | 829919ef894a (diff) |
child 17687 | 8853f37b1e62 |
mercurial/lock.py | file | annotate | diff | comparison | revisions |
--- a/mercurial/lock.py Sat Sep 29 11:57:16 2012 -0500 +++ b/mercurial/lock.py Sat Sep 29 12:28:52 2012 -0500 @@ -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: