aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2013-03-10 20:27:18 -0700
committerMark Sapiro <msapiro@value.net>2013-03-10 20:27:18 -0700
commitb056d1850e44ab2cb6827e2b1a4f0d451459e9eb (patch)
tree4a2ff54708a9a1dc894a7f22ef48749dc2be12c8
parentce42aaef80d28b0d847d2fa44a3b05eb5b0634bd (diff)
downloadmailman2-b056d1850e44ab2cb6827e2b1a4f0d451459e9eb.tar.gz
mailman2-b056d1850e44ab2cb6827e2b1a4f0d451459e9eb.tar.xz
mailman2-b056d1850e44ab2cb6827e2b1a4f0d451459e9eb.zip
Setting digest_size_threshhold to zero now means no digests will be
sent based on size instead of a digest being sent with every post.
Diffstat (limited to '')
-rw-r--r--Mailman/Gui/Digest.py6
-rw-r--r--Mailman/Handlers/ToDigest.py5
-rw-r--r--NEWS4
3 files changed, 10 insertions, 5 deletions
diff --git a/Mailman/Gui/Digest.py b/Mailman/Gui/Digest.py
index f7722019..77691aee 100644
--- a/Mailman/Gui/Digest.py
+++ b/Mailman/Gui/Digest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -56,8 +56,8 @@ class Digest(GUIBase):
_('When receiving digests, which format is default?')),
('digest_size_threshhold', mm_cfg.Number, 3, 0,
- _('How big in Kb should a digest be before it gets sent out?')),
- # Should offer a 'set to 0' for no size threshhold.
+ _('How big in Kb should a digest be before it gets sent out?'
+ ' 0 implies no maximum size.')),
('digest_send_periodic', mm_cfg.Radio, (_('No'), _('Yes')), 1,
_('Should a digest be dispatched daily when the size threshold '
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py
index edbf40dc..2027a46c 100644
--- a/Mailman/Handlers/ToDigest.py
+++ b/Mailman/Handlers/ToDigest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -86,7 +86,8 @@ def process(mlist, msg, msgdata):
# whether the size threshold has been reached.
mboxfp.flush()
size = os.path.getsize(mboxfile)
- if size / 1024.0 >= mlist.digest_size_threshhold:
+ if (mlist.digest_size_threshhold > 0 and
+ size / 1024.0 >= mlist.digest_size_threshhold):
# This is a bit of a kludge to get the mbox file moved to the digest
# queue directory.
try:
diff --git a/NEWS b/NEWS
index a2e3c34f..00b5c10c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ Here is a history of user visible changes to Mailman.
New Features
+ - Setting digest_size_threshhold to zero now means no digests will be
+ sent based on size instead of a digest being sent with every post.
+ (LP: 558274)
+
- There is a new mm_cfg.py setting SUBSCRIBE_FORM_SECRET which will put
a dynamically generated, hidden hash in the listinfo subscribe form and
check it upon submission. Setting this will prevent automated processes