Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv5030/TMDA
Modified Files:
ChangeLog Defaults.py Deliver.py
Log Message:
Bugfix. When doing program deliveries, TMDA was not retaining the
leading From_ line of the message. This created problems for programs
that tried to create mbox files, and didn't add From_ itself (such as
procmail).
Reported by Todd A. Jacobs
in <[EMAIL PROTECTED]> on tmda-users.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog 4 Nov 2002 02:49:24 -0000 1.237
+++ ChangeLog 8 Nov 2002 20:31:10 -0000 1.238
@@ -1,3 +1,8 @@
+2002-11-08 Jason R. Mastaler <[EMAIL PROTECTED]>
+
+ * Deliver.py (Deliver.deliver): Retain From_ when doing a program
+ delivery.
+
2002-11-03 Jason R. Mastaler <[EMAIL PROTECTED]>
* AutoResponse.py (AutoResponse.create): Add Version.CODENAME to
Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- Defaults.py 1 Nov 2002 22:53:07 -0000 1.150
+++ Defaults.py 8 Nov 2002 20:31:16 -0000 1.151
@@ -151,7 +151,7 @@
# DELIVERY = "~/Mailbox"
# DELIVERY = "/var/mail/jasonrm"
# DELIVERY = "|/usr/bin/maildrop"
-# DELIVERY = "|/usr/bin/procmail -f $SENDER ~/.procmailrc-tmda"
+# DELIVERY = "|/usr/bin/procmail ~/.procmailrc-tmda"
# DELIVERY = "[EMAIL PROTECTED]"
#
# No default for non-qmail users.
Index: Deliver.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Deliver.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Deliver.py 30 Sep 2002 23:45:54 -0000 1.6
+++ Deliver.py 8 Nov 2002 20:31:17 -0000 1.7
@@ -60,7 +60,6 @@
from the TMDA.FilterParser instance.
"""
self.msg = msg
- self.message = msg.as_string()
self.option = delivery_option
self.env_sender = os.environ.get('SENDER')
@@ -110,9 +109,9 @@
"""Deliver the message appropriately."""
(type, dest) = self.get_instructions()
if type == 'program':
- self.__deliver_program(self.message, dest)
+ self.__deliver_program(self.msg.as_string(unixfrom=1), dest)
elif type == 'forward':
- self.__deliver_forward(self.message, dest)
+ self.__deliver_forward(self.msg.as_string(), dest)
elif type == 'mbox':
# Ensure destination path exists.
if not os.path.exists(dest):
@@ -124,14 +123,14 @@
raise Errors.DeliveryError, \
'Destination "%s" is a symlink!' % dest
else:
- self.__deliver_mbox(self.message, dest)
+ self.__deliver_mbox(self.msg.as_string(), dest)
elif type == 'maildir':
# Ensure destination path exists.
if not os.path.exists(dest):
raise Errors.DeliveryError, \
'Destination "%s" does not exist!' % dest
else:
- self.__deliver_maildir(self.message, dest)
+ self.__deliver_maildir(self.msg.as_string(), dest)
def __deliver_program(self, message, program):
"""Deliver message to /bin/sh -c program."""
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
