Use different warning message for dotlock mtime change.

--HG--
branch : HEAD

diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c
index 4f57ba0a3c07e9d27aae7097ba53abb7fc1302fa..699abb1b9bf420e7c193fd48dd50aca7c540a750 100644 (file)
--- a/src/lib/file-dotlock.c
+++ b/src/lib/file-dotlock.c
@@ -279,12 +279,17 @@ int file_unlock_dotlock(const char *path, const struct dotlock *dotlock)
        }
 
        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);