From 5b3d19065df789e49ba197d5d883d4e3c5ca8726 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sat, 10 Jun 2006 22:50:20 +0000 Subject: [PATCH] override sender on sendmail invocation svn path=/main/trunk/; revision=3486 --- pym/portage_mail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage_mail.py b/pym/portage_mail.py index 37bd11b64..54043e674 100644 --- a/pym/portage_mail.py +++ b/pym/portage_mail.py @@ -61,16 +61,16 @@ def send_mail(mysettings, message): else: myrecipient = mysettings["PORTAGE_ELOG_MAILURI"] + myfrom = message.get("From") + # user wants to use a sendmail binary instead of smtp if mymailhost[0] == os.sep and os.path.exists(mymailhost): - fd = os.popen(mymailhost+" "+myrecipient, "w") + fd = os.popen(mymailhost+" -f "+myfrom+" "+myrecipient, "w") fd.write(mymessage.as_string()) if fd.close() != None: sys.stderr.write("!!! %s returned with a non-zero exit code. This generally indicates an error.\n" % mymailhost) else: try: - myfrom = message.get("From") - if int(mymailport) > 100000: myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000) myconn.starttls() -- 2.26.2