From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 12 Mar 2012 15:29:16 +0000 (+0100)
Subject: flocks do not need freeing
X-Git-Tag: userdir-ldap-0.3.85~65^2~3
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=c0d709a2445222baef4f3fdd79c1090576ae6a93

flocks do not need freeing
---

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__":