# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1418996341 -28800
# Node ID 5eb7e2400c18cda83f601304417141740cf104b4
# Parent  4d82099d1fe006c5d5e227d835e01ed4cc42b394
fix pid locking

diff -r 4d82099d1fe0 -r 5eb7e2400c18 py/tempserver.py
--- a/py/tempserver.py	Fri Jul 25 23:53:38 2014 +0800
+++ b/py/tempserver.py	Fri Dec 19 21:39:01 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: