Convert CFLR in incoming mails to plain LF. Thanks to Johannes Berg. Also check...

diff --git a/eoc.py b/eoc.py
index 3400d65ce528c14b18943eaecc64a2ab1d1ecb98..c2df4038be7587dfc627c0232b8c11789a746cf1 100644 (file)
--- a/eoc.py
+++ b/eoc.py
@@ -419,8 +419,8 @@ class MailingListManager:
                              "w")
                 f.write(text)
                 status = f.close()
                              "w")
                 f.write(text)
                 status = f.close()

-                if status != 0:
-                    error("%s returned %d, mail sending probably failed" %
+                if status:
+                    error("%s returned %s, mail sending probably failed" %

                            (self.sendmail, status))
                     sys.exit((status >> 8) & 0xff)
         else:
                            (self.sendmail, status))
                     sys.exit((status >> 8) & 0xff)
         else:


@@ -475,6 +475,8 @@ class MailingList:
 
     def read_stdin(self):
         data = sys.stdin.read()
 
     def read_stdin(self):
         data = sys.stdin.read()

+        # Convert CRLF to plain LF
+        data = "\n".join(data.split("\r\n"))

         # Skip Unix mbox "From " mail start indicator
         if data[:5] == "From ":
             data = string.split(data, "\n", 1)[1]
         # Skip Unix mbox "From " mail start indicator
         if data[:5] == "From ":
             data = string.split(data, "\n", 1)[1]