projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
13d9a7f
)
GenerateDir is no longer a global var
author
Peter Palfrader
<peter@palfrader.org>
Mon, 12 Mar 2012 13:57:53 +0000
(14:57 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 12 Mar 2012 13:57:53 +0000
(14:57 +0100)
ud-generate
patch
|
blob
|
history
diff --git
a/ud-generate
b/ud-generate
index
3a8fa32
..
f5e6ad7
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-1232,11
+1232,11
@@
def getLastLDAPChangeTime(l):
return last
return last
-def getLastBuildTime():
+def getLastBuildTime(
gdir
):
cache_last_mod = 0
try:
cache_last_mod = 0
try:
- fd = open(os.path.join(
GenerateD
ir, "last_update.trace"), "r")
+ fd = open(os.path.join(
gd
ir, "last_update.trace"), "r")
cache_last_mod=fd.read().split()
try:
cache_last_mod = cache_last_mod[0]
cache_last_mod=fd.read().split()
try:
cache_last_mod = cache_last_mod[0]
@@
-1255,7
+1255,6
@@
def getLastBuildTime():
def ud_generate():
def ud_generate():
- global GenerateDir
global GroupIDMap
parser = optparse.OptionParser()
parser.add_option("-g", "--generatedir", dest="generatedir", metavar="DIR",
global GroupIDMap
parser = optparse.OptionParser()
parser.add_option("-g", "--generatedir", dest="generatedir", metavar="DIR",
@@
-1272,16
+1271,16
@@
def ud_generate():
l = make_ldap_conn()
if options.generatedir is not None:
l = make_ldap_conn()
if options.generatedir is not None:
-
GenerateD
ir = os.environ['UD_GENERATEDIR']
+
generate_d
ir = os.environ['UD_GENERATEDIR']
elif 'UD_GENERATEDIR' in os.environ:
elif 'UD_GENERATEDIR' in os.environ:
-
GenerateD
ir = os.environ['UD_GENERATEDIR']
+
generate_d
ir = os.environ['UD_GENERATEDIR']
ldap_last_mod = getLastLDAPChangeTime(l)
ldap_last_mod = getLastLDAPChangeTime(l)
- cache_last_mod = getLastBuildTime()
+ cache_last_mod = getLastBuildTime(
generate_dir
)
need_update = ldap_last_mod > cache_last_mod
if not options.force and not need_update:
need_update = ldap_last_mod > cache_last_mod
if not options.force and not need_update:
- fd = open(os.path.join(
GenerateD
ir, "last_update.trace"), "w")
+ fd = open(os.path.join(
generate_d
ir, "last_update.trace"), "w")
fd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
fd.close()
sys.exit(0)
fd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
fd.close()
sys.exit(0)
@@
-1303,14
+1302,14
@@
def ud_generate():
lock = None
try:
lock = None
try:
- lockf = os.path.join(
GenerateD
ir, 'ud-generate.lock')
+ lockf = os.path.join(
generate_d
ir, 'ud-generate.lock')
lock = get_lock( lockf )
if lock is None:
sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
sys.exit(1)
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(
GenerateD
ir, "last_update.trace"), "w")
- generate_all(
GenerateD
ir, l)
+ tracefd = open(os.path.join(
generate_d
ir, "last_update.trace"), "w")
+ generate_all(
generate_d
ir, l)
tracefd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
tracefd.close()
tracefd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
tracefd.close()