dovecot-2.2: dsync: If mailbox is already deleted locally, don't...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/40e220761a41
changeset: 18932:40e220761a41
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Aug 15 12:05:34 2015 +0200
description:
dsync: If mailbox is already deleted locally, don't attempt to delete it again.
This only caused an unnecessary desync warning / exit code.

diffstat:

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

diffs (13 lines):

diff -r 4fcf4d745a27 -r 40e220761a41 src/doveadm/dsync/dsync-mailbox-tree-sync.c
--- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c	Wed Aug 12 12:52:06 2015 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c	Sat Aug 15 12:05:34 2015 +0200
@@ -164,7 +164,8 @@
 			guid_128_to_string(node->mailbox_guid), reason);
 	}
 
-	if (tree == ctx->local_tree) {
+	if (tree == ctx->local_tree &&
+	    node->existence != DSYNC_MAILBOX_NODE_DELETED) {
 		/* delete this mailbox locally */
 		i_assert(ctx->sync_type != DSYNC_MAILBOX_TREES_SYNC_TYPE_PRESERVE_LOCAL);
 		change = array_append_space(&ctx->changes);