From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sat, 18 Jan 2014 01:16:59 +0000 (+0000)
Subject: Merge branch 'master' of ssh://draghi.debian.org/~/userdir-ldap
X-Git-Tag: userdir-ldap-0.3.85~33
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=894732a64582d3d48c768934f3828a3b58807f46;hp=b4d8bfa0dd853da90f0f3bf27879d42638c57405;p=mirror%2Fuserdir-ldap.git

Merge branch 'master' of ssh://draghi.debian.org/~/userdir-ldap
---

diff --git a/ud-generate b/ud-generate
index e9c4753..d39a84c 100755
--- a/ud-generate
+++ b/ud-generate
@@ -1445,18 +1445,14 @@ def ud_generate():
 
    need_update = (ldap_last_mod > cache_last_ldap_mod) or (unix_last_mod > cache_last_unix_mod) or (time_started - last_run > MAX_UD_AGE)
 
-   if not options.force and not need_update:
-      fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
-      fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
-      fd.close()
-      sys.exit(0)
-
-   tracefd = open(os.path.join(generate_dir, "last_update.trace"), "w")
-   generate_all(generate_dir, l)
-   tracefd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, time_started))
-   tracefd.close()
-   if options.mq:
-      mq_notify(options)
+   fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
+   if need_update or options.force:
+      generate_all(generate_dir, l)
+      if options.mq:
+         mq_notify(options)
+   fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
+   fd.close()
+   sys.exit(0)
 
 
 if __name__ == "__main__":