X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=d6996334d6fc0f6b0bcebda42078ac1e2b431e4a;hb=aefc0a50e8e2603a95f31721712111bda4a56864;hp=c3eff77bb491f4d42672fc5ecef8081a61c6c9a9;hpb=9cf20ca6242f82b48ca3d201fab98ba1aabbfe49;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index c3eff77..d699633 100755 --- a/ud-generate +++ b/ud-generate @@ -1234,24 +1234,25 @@ last = sorted_mods[-1][1]['reqEnd'][0].split('.')[0] if 'UD_GENERATEDIR' in os.environ: GenerateDir = os.environ['UD_GENERATEDIR'] -cache_last_mod = 0 +cache_last_mod = [0,0] try: fd = open(os.path.join(GenerateDir, "last_update.trace"), "r") - cache_last_mod=fd.read().strip() + cache_last_mod=fd.read().split() fd.close() except IOError, e: if e.errno == errno.ENOENT: pass else: raise e -if cache_last_mod >= last: - sys.exit(0) fd = open(os.path.join(GenerateDir, "last_update.trace"), "w") -fd.write(last) +fd.write("%s\n%s\n" % (last, int(time.time()))) fd.close() +if cache_last_mod[0] >= last: + sys.exit(0) + # Fetch all the groups GroupIDMap = {} attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\