Mercurial > templog

changeset 218:11631a7f4cf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Matt Johnston <matt@ucc.asn.au>
date Fri, 19 Dec 2014 21:39:18 +0800
parents 5eb7e2400c18 (diff) e3b85f9fbb03 (current diff)
children 16a83e2c97a0
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/py/tempserver.py	Fri Jul 25 23:55:35 2014 +0800
+++ b/py/tempserver.py	Fri Dec 19 21:39:18 2014 +0800
@@ -110,9 +110,9 @@
     pidf = lockfile.pidlockfile.PIDLockFile(pidpath, threaded=False)
     do_hup = '--hup' in sys.argv
     try:
-        pidf.acquire(0)
+        pidf.acquire(1)
         pidf.release()
-    except lockfile.AlreadyLocked, e:
+    except (lockfile.AlreadyLocked, lockfile.LockTimeout), e:
         pid = pidf.read_pid()
         if do_hup:
             try: