dovecot-2.0: mdbox: Previous change was broken, fixed now proper...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/754edf799dac
changeset: 11612:754edf799dac
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jun 22 21:00:15 2010 +0100
description:
mdbox: Previous change was broken, fixed now properly to make purge fail early.

diffstat:

 src/lib-storage/index/dbox-multi/mdbox-purge.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r be6931536ee0 -r 754edf799dac src/lib-storage/index/dbox-multi/mdbox-purge.c
--- a/src/lib-storage/index/dbox-multi/mdbox-purge.c	Tue Jun 22 18:27:03 2010 +0100
+++ b/src/lib-storage/index/dbox-multi/mdbox-purge.c	Tue Jun 22 21:00:15 2010 +0100
@@ -521,10 +521,11 @@
 	}
 
 	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);