dovecot-1.2: Maildir saving: If uidlist locking timed out and we...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/2358ee07d2db
changeset: 8186:2358ee07d2db
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Sep 11 16:37:32 2008 +0300
description:
Maildir saving: If uidlist locking timed out and we needed it, fail instead of trying to continue (and break).

diffstat:

1 file changed, 2 insertions(+), 1 deletion(-)
src/lib-storage/index/maildir/maildir-save.c |    3 ++-

diffs (13 lines):

diff -r 28abdf929037 -r 2358ee07d2db src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c	Wed Sep 10 21:53:13 2008 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c	Thu Sep 11 16:37:32 2008 +0300
@@ -675,7 +675,8 @@ int maildir_transaction_save_commit_pre(
 	}
 	ret = maildir_uidlist_sync_init(ctx->mbox->uidlist, sync_flags,
 					&ctx->uidlist_sync_ctx);
-	if (ret < 0) {
+	if (ret <= 0 &&
+	    (ret < 0 || (sync_flags & MAILDIR_UIDLIST_SYNC_TRYLOCK) == 0)) {
 		maildir_transaction_save_rollback(ctx);
 		return -1;
 	}