|
Line
Link Here
|
| 0 |
-- mod_mail.py.ori 2006-03-13 00:56:32.000000000 -0700 |
0 |
++ mod_mail.py 2006-03-13 01:57:08.000000000 -0700 |
|
Lines 33-39
Link Here
|
| 33 |
myrecipient = mysettings["PORTAGE_ELOG_MAILURI"] |
33 |
myrecipient = mysettings["PORTAGE_ELOG_MAILURI"] |
| 34 |
try: |
34 |
try: |
| 35 |
mymessage = email.Message.Message() |
35 |
mymessage = email.Message.Message() |
| 36 |
mymessage.set_unixfrom("portage") |
36 |
if mymailhost != "localhost": |
|
|
37 |
mymessage.set_unixfrom("portage@"+socket.getfqdn()) |
| 38 |
else: |
| 39 |
mymessage.set_unixfrom("portage") |
| 37 |
mymessage.set_payload(fulltext) |
40 |
mymessage.set_payload(fulltext) |
| 38 |
mymessage["To"] = myrecipient |
41 |
mymessage["To"] = myrecipient |
| 39 |
mymessage["Subject"] = "[portage] Ebuild log for %s" % cpv |
42 |
mymessage["Subject"] = "[portage] Ebuild log for %s" % cpv |
|
Lines 45-51
Link Here
|
| 45 |
myconn = smtplib.SMTP(mymailhost, mymailport) |
48 |
myconn = smtplib.SMTP(mymailhost, mymailport) |
| 46 |
if mymailuser != "" and mymailpasswd != "": |
49 |
if mymailuser != "" and mymailpasswd != "": |
| 47 |
myconn.login(mymailuser, mymailpasswd) |
50 |
myconn.login(mymailuser, mymailpasswd) |
| 48 |
myconn.sendmail("portage", myrecipient, mymessage.as_string()) |
51 |
if mymailhost != "localhost": |
|
|
52 |
myconn.sendmail("portage@"+socket.getfqdn(), myrecipient, mymessage.as_string()) |
| 53 |
else: |
| 54 |
myconn.sendmail("portage", myrecipient, mymessage.as_string()) |
| 49 |
myconn.quit() |
55 |
myconn.quit() |
| 50 |
except smtplib.SMTPException, e: |
56 |
except smtplib.SMTPException, e: |
| 51 |
raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e)) |
57 |
raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e)) |
