From: Lars Wirzenius Date: Sat, 12 Aug 2006 12:16:16 +0000 (+0300) Subject: Convert CFLR in incoming mails to plain LF. Thanks to Johannes Berg. Also check... X-Git-Url: https://git.sommitrealweird.co.uk/eoc.git/commitdiff_plain/bdae622bd1dea48dfc700620c1abb158b91f710e?ds=sidebyside Convert CFLR in incoming mails to plain LF. Thanks to Johannes Berg. Also check for status correctly (None is OK, not failure) from os.popen. --- diff --git a/eoc.py b/eoc.py index 3400d65..c2df403 100644 --- a/eoc.py +++ b/eoc.py @@ -419,8 +419,8 @@ class MailingListManager: "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: @@ -475,6 +475,8 @@ class MailingList: 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]