From b1720551137e517b66ba3a495150d85778240c5c Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 23 Apr 2021 10:59:35 +0200
Subject: [PATCH] lib-sieve: sieve-actions - Avoid logging about rolled-back
 successful implicit keep.

This will now readily happen when executed (not committed) success implicit keep
is replaced by a failure implicit keep.
---
 src/lib-sieve/sieve-actions.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 14fc603b3..79ed5c19d 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -747,8 +747,11 @@ act_store_log_status(struct act_store_transaction *trans,
 		}
 	/* Store aborted? */
 	} else if (rolled_back) {
-		sieve_result_global_log(aenv, "store into mailbox %s aborted",
-					mailbox_identifier);
+		if (!aenv->action->keep) {
+			sieve_result_global_log(
+				aenv, "store into mailbox %s aborted",
+				mailbox_identifier);
+		}
 	/* Succeeded */
 	} else {
 		struct event_passthrough *e =
-- 
GitLab