Mercurial > hg
changeset 17683:6d7db5794e8c
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 29 Sep 2012 12:28:52 -0500 |
parents | a41fd730f230 (current diff) 829919ef894a (diff) |
children | 8853f37b1e62 |
files | mercurial/lock.py |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: