# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1246993252 14400
# Node ID dff7312629a72f6ee90ab470ad0d50dfa68e6f71
# Parent  ee173ea99ea630f624db378ef518984fa959f3f6
expire: If mail_debug=yes, expire-tool shouldn't log about disabling expire plugin.

diff -r ee173ea99ea6 -r dff7312629a7 src/plugins/expire/expire-plugin.c
--- a/src/plugins/expire/expire-plugin.c	Tue Jul 07 13:25:01 2009 -0400
+++ b/src/plugins/expire/expire-plugin.c	Tue Jul 07 15:00:52 2009 -0400
@@ -308,7 +308,8 @@
 		expire.next_hook_mail_storage_created =
 			hook_mail_storage_created;
 		hook_mail_storage_created = expire_mail_storage_created;
-	} else if (getenv("DEBUG") != NULL) {
+	} else if (getenv("DEBUG") != NULL &&
+		   getenv("EXPIRE_TOOL_BINARY") == NULL) {
 		i_info("expire: No expire or expire_altmove settings - "
 		       "plugin disabled");
 	}
diff -r ee173ea99ea6 -r dff7312629a7 src/plugins/expire/expire-tool.c
--- a/src/plugins/expire/expire-tool.c	Tue Jul 07 13:25:01 2009 -0400
+++ b/src/plugins/expire/expire-tool.c	Tue Jul 07 15:00:52 2009 -0400
@@ -242,6 +242,7 @@
 	/* remove these so that expire plugin won't get used */
 	env_remove("EXPIRE");
 	env_remove("EXPIRE_ALTMOVE");
+	env_put("EXPIRE_TOOL_BINARY=1");
 
 	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;