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.

diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c
index c365954b652c548c9466cb98ed4121d1ed95ad5b..7e4e0c5a5af2ada770f1f6d0e8edea75e0369c6b 100644 (file)
--- a/src/lib-storage/index/index-mailbox-size.c
+++ b/src/lib-storage/index/index-mailbox-size.c
@@ -330,6 +330,8 @@ index_mailbox_vsize_hdr_add_missing(struct mailbox_vsize_update *update,
                        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 */

diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c
index 87add47001fc726dbd3645a1e91b91678897765e..34bc85f06596edf64261c489fd49010315485359 100644 (file)
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c
@@ -367,6 +367,8 @@ static int pop3_map_read(struct mail_storage *storage, struct mailbox *pop3_box)
                        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,