Mercurial > dovecot > core-2.2

changeset 1359:bbcbe27926ad HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use different warning message for dotlock mtime change.
author Timo Sirainen <tss@iki.fi>
date Tue, 15 Apr 2003 22:00:14 +0300
parents 70b60399c7d3
children 5c67f77e4116
files src/lib/file-dotlock.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/file-dotlock.c	Tue Apr 15 19:58:48 2003 +0300
+++ b/src/lib/file-dotlock.c	Tue Apr 15 22:00:14 2003 +0300
@@ -279,12 +279,17 @@
 	}
 
 	if (dotlock->ino != st.st_ino ||
-	    !CMP_DEV_T(dotlock->dev, st.st_dev) ||
-	    dotlock->mtime != st.st_mtime) {
+	    !CMP_DEV_T(dotlock->dev, st.st_dev)) {
 		i_warning("Our dotlock file %s was overridden", lock_path);
 		return 0;
 	}
 
+	if (dotlock->mtime != st.st_mtime) {
+		i_warning("Our dotlock file %s was modified (%s vs %s), "
+			  "assuming it wasn't overridden", lock_path,
+			  dec2str(dotlock->mtime), dec2str(st.st_mtime));
+	}
+
 	if (unlink(lock_path) < 0) {
 		if (errno == ENOENT) {
 			i_warning("Our dotlock file %s was deleted", lock_path);