------------------------------------------------------------
revno: 1440
fixes bug: https://launchpad.net/bugs/1260883
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Fri 2013-12-13 16:53:13 -0800
message:
Fixed bin/arch to not create scrubbed attachments for messages skipped
when processing the --start= option.
modified:
Mailman/Archiver/pipermail.py
Mailman/Mailbox.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Archiver/pipermail.py'
--- Mailman/Archiver/pipermail.py 2010-02-23 01:00:40 +0000
+++ Mailman/Archiver/pipermail.py 2013-12-14 00:53:13 +0000
@@ -552,6 +552,8 @@
if start is None:
start = 0
counter = 0
+ if start:
+ mbox.skipping(True)
while counter < start:
try:
m = mbox.next()
@@ -560,6 +562,8 @@
if m is None:
return
counter += 1
+ if start:
+ mbox.skipping(False)
while 1:
try:
pos = input.tell()
=== modified file 'Mailman/Mailbox.py'
--- Mailman/Mailbox.py 2011-12-13 01:31:32 +0000
+++ Mailman/Mailbox.py 2013-12-14 00:53:13 +0000
@@ -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
@@ -110,3 +110,11 @@
return self._scrubber(self._mlist, msg)
else:
return msg
+
+ def skipping(self, flag):
+ """ This method allows the archiver to skip over messages without
+ scrubbing attachments into the attachments directory."""
+ if flag:
+ self.factory = _safeparser
+ else:
+ self.factory = _archfactory(self)
=== modified file 'NEWS'
--- NEWS 2013-12-07 01:19:28 +0000
+++ NEWS 2013-12-14 00:53:13 +0000
@@ -9,6 +9,9 @@
Bug Fixes and other patches
+ - Fixed bin/arch to not create scrubbed attachments for messages skipped
+ when processing the --start= option. (LP: #1260883)
+
- Fixed email address validation to do a bit better in obscure cases.
(LP: #1258703)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
