projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add webPassword
[mirror/userdir-ldap.git]
/
ud-generate
diff --git
a/ud-generate
b/ud-generate
index
f00cf6e
..
560518e
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-91,10
+91,10
@@
def safe_rmtree(dir):
def get_lock(fn, wait=5*60, max_age=3600*6):
try:
def get_lock(fn, wait=5*60, max_age=3600*6):
try:
- stat = os.stat(fn)
- if stat
[ST_MTIME]
< time.time() - max_age:
- sys.stderr.write("Removing stale lock %s"%(fn))
- os.unlink(fn)
+ stat = os.stat(fn
+ '.lock'
)
+ if stat
.st_mtime
< time.time() - max_age:
+ sys.stderr.write("Removing stale lock %s"%(fn
+ '.lock'
))
+ os.unlink(fn
+ '.lock'
)
except OSError, error:
if error.errno == errno.ENOENT:
pass
except OSError, error:
if error.errno == errno.ENOENT:
pass
@@
-1242,17
+1242,18
@@
for x in attrs:
if x[1].has_key("subGroup") != 0:
SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"])
if x[1].has_key("subGroup") != 0:
SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"])
+lock = None
try:
try:
- lockf
ile
= os.path.join(GenerateDir, 'ud-generate.lock')
- lock = get_lock( lockf
ile
)
+ lockf = os.path.join(GenerateDir, 'ud-generate.lock')
+ lock = get_lock( lockf )
if lock is None:
if lock is None:
- sys.stderr.write("Could not acquire lock %s.\n"%(lockf
ile
))
+ sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
sys.exit(1)
generate_all(GenerateDir, l)
finally:
sys.exit(1)
generate_all(GenerateDir, l)
finally:
- if
not lock is
None:
+ if
lock is not
None:
lock.release()
# vim:set et:
lock.release()
# vim:set et: