X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=064a9bdaad41fc706fe2b869d8737b85d2a048cf;hb=c0d709a2445222baef4f3fdd79c1090576ae6a93;hp=b3297195e5d13b72ae2eac5063d0ee14308931b1;hpb=966a64834daa780fc48b2d24ac4c59bb8cf0beb4;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index b329719..064a9bd 100755
--- a/ud-generate
+++ b/ud-generate
@@ -1299,22 +1299,16 @@ def ud_generate():
       fd.close()
       sys.exit(0)
 
-   lock = None
-   try:
-      lockf = os.path.join(generate_dir, 'ud-generate.lock')
-      lock = get_lock( lockf )
-      if lock is None:
-         sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
-         sys.exit(1)
-
-      tracefd = open(os.path.join(generate_dir, "last_update.trace"), "w")
-      generate_all(generate_dir, l)
-      tracefd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
-      tracefd.close()
-
-   finally:
-      if lock is not None:
-         lock.close()
+   lockf = os.path.join(generate_dir, 'ud-generate.lock')
+   lock = get_lock( lockf )
+   if lock is None:
+      sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
+      sys.exit(1)
+
+   tracefd = open(os.path.join(generate_dir, "last_update.trace"), "w")
+   generate_all(generate_dir, l)
+   tracefd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
+   tracefd.close()
 
 
 if __name__ == "__main__":