Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5053:38adf005146b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If mbox had broken UIDs and we didn't rewrite them, don't mark the index as being synced.
author Timo Sirainen <tss@iki.fi>
date Mon, 22 Jan 2007 14:11:10 +0200
parents 831fa7e4caa0
children 0f410e51e36f
files src/lib-storage/index/mbox/mbox-sync.c
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/mbox/mbox-sync.c	Mon Jan 22 14:10:20 2007 +0200
+++ b/src/lib-storage/index/mbox/mbox-sync.c	Mon Jan 22 14:11:10 2007 +0200
@@ -1018,7 +1018,7 @@
 	uint32_t uid, messages_count;
 	uoff_t offset;
 	int ret;
-	bool expunged, skipped_mails;
+	bool expunged, skipped_mails, uids_broken;
 
 	messages_count =
 		mail_index_view_get_messages_count(sync_ctx->sync_view);
@@ -1029,7 +1029,7 @@
 	if (ret <= 0)
 		return ret;
 
-	skipped_mails = FALSE;
+	skipped_mails = uids_broken = FALSE;
 	while ((ret = mbox_sync_read_next_mail(sync_ctx, mail_ctx)) > 0) {
 		uid = mail_ctx->mail.uid;
 
@@ -1063,6 +1063,8 @@
 			sync_ctx->mbox->mbox_sync_dirty = TRUE;
 			return 0;
 		}
+		if (mail_ctx->mail.uid_broken)
+			uids_broken = TRUE;
 
 		if (mail_ctx->pseudo)
 			uid = 0;
@@ -1187,6 +1189,13 @@
 
 	if (!skipped_mails)
 		sync_ctx->mbox->mbox_sync_dirty = FALSE;
+
+	if (uids_broken && sync_ctx->delay_writes) {
+		/* once we get around to writing the changes, we'll need to do
+		   a full sync to avoid the "UIDs broken in partial sync"
+		   error */
+		sync_ctx->mbox->mbox_sync_dirty = TRUE;
+	}
 	return 1;
 }