From bdae622bd1dea48dfc700620c1abb158b91f710e Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@iki.fi>
Date: Sat, 12 Aug 2006 15:16:16 +0300
Subject: [PATCH 1/1] 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.
---
eoc.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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]
--
2.39.5