From 248c5368a842fa9b6551cd87993e96e3f7829df8 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Fri, 17 Jan 2014 20:23:38 +0000 Subject: [PATCH] this is a bit cleaner Signed-off-by: Stephen Gran --- ud-generate | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) 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__": -- 2.20.1