# HG changeset patch # User Alex Zeffertt # Date 1272012389 -3600 # Node ID db331f21e1af4334f5a5f9500f90f01959499846 # Parent 40aba351028136e395efdbc3ca612e8409dc8180 CA-40621: Make the charset explicit in outgoing emails sent by mail-alarm Signed-off-by: Alex Zeffertt diff -r 40aba3510281 -r db331f21e1af scripts/mail-alarm --- a/scripts/mail-alarm Fri Apr 23 09:41:44 2010 +0100 +++ b/scripts/mail-alarm Fri Apr 23 09:46:29 2010 +0100 @@ -393,6 +393,7 @@ # Run ssmtp to send mail chld_stdin, chld_stdout = os.popen2(["/usr/sbin/ssmtp", "-C%s" % fname, destination]) chld_stdin.write("From: noreply@%s\n" % getfqdn().encode('utf-8')) + chld_stdin.write('Content-Type: text/plain; charset="utf-8"\n') chld_stdin.write("To: %s\n" % destination.encode('utf-8')) chld_stdin.write("Subject: %s\n" % msg.generate_email_subject().encode('utf-8')) chld_stdin.write("\n")