dovecot-2.0: expire: Fixed mail_debug logging when same transact...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Mar 7 01:00:29 EET 2011
details: http://hg.dovecot.org/dovecot-2.0/rev/2cb0fb910441
changeset: 12667:2cb0fb910441
user: Timo Sirainen <tss at iki.fi>
date: Mon Mar 07 01:00:28 2011 +0200
description:
expire: Fixed mail_debug logging when same transaction expunged all messages and saved new.
diffstat:
src/plugins/expire/expire-plugin.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (25 lines):
diff -r 63ed0d3f4f52 -r 2cb0fb910441 src/plugins/expire/expire-plugin.c
--- a/src/plugins/expire/expire-plugin.c Mon Mar 07 00:57:08 2011 +0200
+++ b/src/plugins/expire/expire-plugin.c Mon Mar 07 01:00:28 2011 +0200
@@ -128,6 +128,11 @@
if (xt->first_expunged) {
/* first mail expunged. dict needs updating. */
first_nonexpunged_timestamp(t, &new_stamp);
+ if (new_stamp == 0 && xt->saves) {
+ /* everything was expunged, but also within this
+ transaction a new message was saved */
+ new_stamp = ioloop_time;
+ }
if (user->mail_debug) {
i_debug("expire: Expunging first message in %s, "
"updating timestamp to %ld",
@@ -150,8 +155,7 @@
box->storage->user->username, "/",
mailbox_get_vname(box), NULL);
if (xt->first_expunged) {
- if (new_stamp == 0 && xt->saves)
- new_stamp = ioloop_time;
+ /* new_stamp is already set */
} else {
i_assert(xt->saves);
/* saved new mails. dict needs to be updated only if
More information about the dovecot-cvs
mailing list