Index: trunk/server/common/oursrc/hacron/hacron
===================================================================
--- trunk/server/common/oursrc/hacron/hacron	(revision 1456)
+++ trunk/server/common/oursrc/hacron/hacron	(revision 1457)
@@ -59,4 +59,5 @@
 
     def __enter__(self):
+        tries = 0
         while True:
             try:
@@ -65,4 +66,8 @@
                 logger.error('Could not acquire lock %s.  Sleeping...' % self.name)
                 time.sleep(0.5)
+                tries += 1
+                if not tries % 60:
+                    logger.error("Waited too long; got bored.  Clearing lock %s." % self.name)
+                    _remove(self.name)
             else:
                 break
@@ -71,5 +76,5 @@
         os.close(self.lock)
         _remove(self.name)
-
+        
 def _touch(path):
     """Effectively touches a file.  Returns true if successful, false