From 34256c0245613363d07db47d3916fc50547fe401 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 15 Aug 2015 12:05:34 +0200 Subject: [PATCH] dsync: If mailbox is already deleted locally, don't attempt to delete it again. This only caused an unnecessary desync warning / exit code. --- src/doveadm/dsync/dsync-mailbox-tree-sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c index f0a149e8df..c6a6bf5e87 100644 --- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c +++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c @@ -164,7 +164,8 @@ sync_delete_mailbox_node(struct dsync_mailbox_tree_sync_ctx *ctx, 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); -- 2.47.3