From: Stephen Gran <steve@lobefin.net>
Date: Sat, 20 Aug 2011 16:19:24 +0000 (+0100)
Subject: mmmm, that's likely to be a namespace clash
X-Git-Tag: userdir-ldap-0.3.85~92
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=b405ec6c8bd69e3cf2b2c03ef9ab335e4c94f206;p=mirror%2Fuserdir-ldap.git

mmmm, that's likely to be a namespace clash
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/ud-generate b/ud-generate
index f00cf6e..70c6efa 100755
--- a/ud-generate
+++ b/ud-generate
@@ -1243,10 +1243,10 @@ for x in attrs:
       SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"])
 
 try:
-   lockfile = os.path.join(GenerateDir, 'ud-generate.lock')
-   lock = get_lock( lockfile )
+   lockf = os.path.join(GenerateDir, 'ud-generate.lock')
+   lock = get_lock( lockf )
    if lock is None:
-      sys.stderr.write("Could not acquire lock %s.\n"%(lockfile))
+      sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
       sys.exit(1)
 
    generate_all(GenerateDir, l)