__archive_to_mbox(): Message objects does not have any "SetHeader"

  method, use their mapping type interface instead.
ArchiveMail(): Don't do any archiving unless self.archive is true.

1 files changed, 3 insertions, 3 deletions

diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py
index 72d5a927d..cf1773f1b 100644
--- a/Mailman/Archiver/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -157,7 +157,7 @@ class Archiver:
         if self.clobber_date:
             import time
             olddate = post.getheader('date')
-            post.SetHeader('Date', time.ctime(time.time()))
+            post['Date'] = time.ctime(time.time())
         try:
             afn = self.ArchiveFileName()
             mbox = self.__archive_file(afn)
@@ -170,7 +170,7 @@ class Archiver:
             raise
         if self.clobber_date:
             # Resurrect original date setting.
-            post.SetHeader('Date', olddate)
+            post['Date'] = olddate
 
     def ExternalArchive(self, ar, txt):
         d = Utils.SafeDict({'listname': self.internal_name()})
@@ -189,7 +189,7 @@ class Archiver:
     def ArchiveMail(self, msg):
         """Store postings in mbox and/or pipermail archive, depending."""
 	# Fork so archival errors won't disrupt normal list delivery
-        if mm_cfg.ARCHIVE_TO_MBOX == -1:
+        if mm_cfg.ARCHIVE_TO_MBOX == -1 or not self.archive:
             return
 	if os.fork(): 
 	    return