diff options
author | Lars Wirzenius <liw@iki.fi> | 2006-08-12 15:16:16 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@iki.fi> | 2006-08-12 15:16:16 +0300 |
commit | bdae622bd1dea48dfc700620c1abb158b91f710e (patch) | |
tree | 2fc0f861a34a9dc6622ec2ce9495db831e85941d | |
parent | 846728c13fe8b6818f7e6150ea122d90e12ac2f8 (diff) | |
download | eoc-bdae622bd1dea48dfc700620c1abb158b91f710e.tar.gz |
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.
-rw-r--r-- | eoc.py | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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] |