From f5efbeba4e5e58a07cf14227655d2f26db160e85 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 29 Dec 2011 21:55:21 +0100 Subject: [PATCH] fix breaking old ud-generate locks. --- debian/changelog | 6 ++++-- ud-generate | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 149649c..4e0a735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low * userdir_gpg.py: GetClearSig: add lax_multipart to deal with random multipart mails. * naming your variable like a module is unsmart. - * ud-generate: filter on shadowAccount. + * ud-generate: + - filter on shadowAccount. + - fix breaking old ud-generate locks. * ud-mailgate: only run ldapmodfiy if we actually have attributes to modify. * ud-replicate: do not hard-code 'debian.org' in the 'write-zonefile debian.org' call, but instead re-use the domain from email-append. @@ -14,7 +16,7 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low * Fix deprecation warnings for sha module by using hashlib module instead * ud-fingerserv: update Net::LDAP import - -- Peter Palfrader Wed, 02 Nov 2011 23:41:26 +0100 + -- Peter Palfrader Thu, 29 Dec 2011 21:54:54 +0100 userdir-ldap (0.3.79) unstable; urgency=low diff --git a/ud-generate b/ud-generate index d3da309..560518e 100755 --- 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: - 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 -- 2.20.1