# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1418996358 -28800
# Node ID 11631a7f4cf204e4163e8ee04bbb72efa8a7fe3b
# Parent  5eb7e2400c18cda83f601304417141740cf104b4# Parent  e3b85f9fbb03eac351896520b0514a071d5c970b
merge

diff -r e3b85f9fbb03 -r 11631a7f4cf2 py/tempserver.py
--- 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: