dovecot-2.2: doveadm backup: Don't unnecessarily delete mailbox ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/68e5eaecc8b4
changeset: 17888:68e5eaecc8b4
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Oct 06 13:15:10 2014 +0300
description:
doveadm backup: Don't unnecessarily delete mailbox when handling expunges

diffstat:

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

diffs (13 lines):

diff -r 124a7fc23706 -r 68e5eaecc8b4 src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Mon Oct 06 12:21:52 2014 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Mon Oct 06 13:15:10 2014 +0300
@@ -1474,7 +1474,8 @@
 		}
 		return;
 	}
-	if (importer->revert_local_changes) {
+	if (importer->revert_local_changes &&
+	    change->type != DSYNC_MAIL_CHANGE_TYPE_EXPUNGE) {
 		dsync_mailbox_revert_missing(importer, change);
 		*result_r = "Reverting local change by deleting mailbox";
 	} else if (dsync_mailbox_find_common_expunged_uid(importer, change)) {