# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1418996358 -28800
# Node ID c399293de16075803e83272e3da884a408a0313d
# Parent  0c29d1a16c8c0773c5850fd225c594c77de20af1# Parent  a976793021d24d187015240d81e6fafe3c9ba984
merge

diff -r a976793021d2 -r c399293de160 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: