mdbox: Previous change was broken, fixed now properly to make purge fail early.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/dbox-multi/mdbox-purge.c b/src/lib-storage/index/dbox-multi/mdbox-purge.c
index f4d494a959d4c5109c118a29b29779596d0f0f75..58531637168cdcea3449fbbc8b4d35bc243a133e 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-purge.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-purge.c
@@ -521,10 +521,11 @@ int mdbox_purge(struct mail_storage *_storage)
        }
 
        seq_range_array_iter_init(&iter, &ctx->purge_file_ids); i = 0;
-       while (seq_range_array_iter_nth(&iter, i++, &file_id)) T_BEGIN {
+       while (ret == 0 &&
+              seq_range_array_iter_nth(&iter, i++, &file_id)) T_BEGIN {
                file = mdbox_file_init(storage, file_id);
                if (dbox_file_open(file, &deleted) > 0 && !deleted) {
-                       if (mdbox_file_purge(ctx, file) <= 0)
+                       if (mdbox_file_purge(ctx, file) < 0)
                                ret = -1;
                } else {
                        mdbox_map_remove_file_id(storage->map, file_id);