Mercurial > dovecot > core-2.2

changeset 21649:78f38a28086e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage, pop3-migration: Reset lookup_abort before continuing to search This doesn't really fix anything right now, but it'll allow adding the asserts in the following commit.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 20 Feb 2017 19:34:25 +0200
parents 66802cc05f4d
children 5fb623020110
files src/lib-storage/index/index-mailbox-size.c src/plugins/pop3-migration/pop3-migration-plugin.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/index-mailbox-size.c	Tue Feb 21 11:52:59 2017 +0200
+++ b/src/lib-storage/index/index-mailbox-size.c	Mon Feb 20 19:34:25 2017 +0200
@@ -330,6 +330,8 @@
 			mail->lookup_abort = MAIL_LOOKUP_ABORT_NOT_IN_CACHE;
 		}
 		ret = mail_get_virtual_size(mail, &vsize);
+		mail->lookup_abort = MAIL_LOOKUP_ABORT_NEVER;
+
 		if (ret < 0 &&
 		    mailbox_get_last_mail_error(update->box) == MAIL_ERROR_LOOKUP_ABORTED) {
 			/* abort and finish on background */
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c	Tue Feb 21 11:52:59 2017 +0200
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c	Mon Feb 20 19:34:25 2017 +0200
@@ -367,6 +367,8 @@
 			ret = -1;
 			break;
 		}
+		mail->lookup_abort = MAIL_LOOKUP_ABORT_NEVER;
+
 		if (mail_get_special(mail, MAIL_FETCH_UIDL_BACKEND, &uidl) < 0) {
 			i_error("pop3_migration: Failed to get UIDL for msg %u: %s",
 				mail->seq,