dovecot-2.2: dsync: Another fix to handling expunges from the en...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/b27245a6adde
changeset: 15619:b27245a6adde
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jan 09 11:03:43 2013 +0200
description:
dsync: Another fix to handling expunges from the end of mailbox.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r b338c4a08f42 -r b27245a6adde src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jan 09 09:11:09 2013 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jan 09 11:03:43 2013 +0200
@@ -962,6 +962,11 @@
 	if (!importer_next_mail(importer, change->uid)) {
 		/* no more local mails. we can still try to match
 		   expunged mails though. */
+		if (change->type == DSYNC_MAIL_CHANGE_TYPE_EXPUNGE) {
+			/* mail doesn't exist remotely either, don't bother
+			   looking it up locally. */
+			return;
+		}
 		if (change->guid == NULL ||
 		    !dsync_mailbox_find_common_expunged_uid(importer, change)) {
 			/* couldn't match it for an expunged mail. use the last