[Collab-qa-commits] r1419 - udd/udd

[lucas at alioth.debian.org]

Author: lucas
Date: 2009-03-24 02:09:03 +0000 (Tue, 24 Mar 2009)
New Revision: 1419

Modified:
   udd/udd/aux.py
Log:
improve check for lockfile: exit immediately instead of blocking

Modified: udd/udd/aux.py
===================================================================
--- udd/udd/aux.py	2009-03-22 00:06:12 UTC (rev 1418)
+++ udd/udd/aux.py	2009-03-24 02:09:03 UTC (rev 1419)
@@ -42,7 +42,11 @@
   lock_path = path.join(lock_dir, source)
   f = file(lock_path, "w+")
   __locks[lock_path] = f
-  fcntl.flock(f.fileno(), fcntl.LOCK_EX)
+  try:
+    fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+  except IOError:
+    print source+": lockfile found, exiting."
+    exit(1)
 
 def unlock(config, source):
   lock_dir = config['general']['lock-dir']