lib-storage: Move (un)deleting debug message to mailbox_mark_index_deleted

diff --git a/src/lib-storage/list/mail-storage-list-index-rebuild.c b/src/lib-storage/list/mail-storage-list-index-rebuild.c
index ed80ffd195937096d15816773263de18a007e68a..f121d7b9672e3b78d0c28c81bc1523744fc3a653 100644 (file)
--- a/src/lib-storage/list/mail-storage-list-index-rebuild.c
+++ b/src/lib-storage/list/mail-storage-list-index-rebuild.c
@@ -244,7 +244,6 @@ mail_storage_list_mailbox_create(struct mailbox *box,
        if (mailbox_get_last_mail_error(box) == MAIL_ERROR_NOTFOUND) {
                /* if this is because mailbox was marked as deleted,
                   undelete it and retry. */
-               e_debug(box->event, "Attempting to undelete mailbox");
                if (mailbox_mark_index_deleted(box, FALSE) < 0)
                        return -1;
                if (mailbox_create(box, update, FALSE) == 0)

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 06f921eb669d9034acb89c3337084e9e8e7f78c9..f9b1ed0d8c9c101ca4f3b02b6582987a0d2398d7 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1771,6 +1771,9 @@ int mailbox_mark_index_deleted(struct mailbox *box, bool del)
        enum mailbox_flags old_flag;
        int ret;
 
+       e_debug(box->event, "Attempting to %s mailbox", del ?
+               "delete" : "undelete");
+
        if (box->marked_deleted && del) {
                /* we already marked it deleted. this allows plugins to
                   "lock" the deletion earlier. */