lib: Delete stale timestamp documents during database upgrade.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 6b8c9989ea4f9c75ada9df3ae0591fca1b65c20f..d0262722cff27dce3086236ea7482e7ffaf968de 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -737,8 +737,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
             notmuch_messages_has_more (messages);
             notmuch_messages_advance (messages))
        {
-           if (do_progress_notify)
+           if (do_progress_notify) {
                progress_notify (closure, count, total);
+               do_progress_notify = 0;
+           }
 
            message = notmuch_messages_get (messages);
 
@@ -781,6 +783,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
                                                            term.c_str() + 10);
                notmuch_directory_set_mtime (directory, mtime);
                notmuch_directory_destroy (directory);
+
+               db->delete_document (*p);
            }
        }
     }