| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 12:43:12 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9570 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/elog_modules/mod_mail.py |
| 7 |
main/branches/2.1.2/pym/elog_modules/mod_mail_summary.py |
| 8 |
Log: |
| 9 |
Support ${HOST} substitution in "From" field. Thanks to wschlich. |
| 10 |
(trunk r9510) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/pym/elog_modules/mod_mail.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/pym/elog_modules/mod_mail.py 2008-03-28 12:41:23 UTC (rev 9569) |
| 16 |
+++ main/branches/2.1.2/pym/elog_modules/mod_mail.py 2008-03-28 12:43:12 UTC (rev 9570) |
| 17 |
@@ -14,6 +14,7 @@ |
| 18 |
myrecipient = "root@localhost" |
| 19 |
|
| 20 |
myfrom = mysettings["PORTAGE_ELOG_MAILFROM"] |
| 21 |
+ myfrom = myfrom.replace("${HOST}", socket.getfqdn()) |
| 22 |
mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] |
| 23 |
mysubject = mysubject.replace("${PACKAGE}", cpv) |
| 24 |
mysubject = mysubject.replace("${HOST}", socket.getfqdn()) |
| 25 |
|
| 26 |
Modified: main/branches/2.1.2/pym/elog_modules/mod_mail_summary.py |
| 27 |
=================================================================== |
| 28 |
--- main/branches/2.1.2/pym/elog_modules/mod_mail_summary.py 2008-03-28 12:41:23 UTC (rev 9569) |
| 29 |
+++ main/branches/2.1.2/pym/elog_modules/mod_mail_summary.py 2008-03-28 12:43:12 UTC (rev 9570) |
| 30 |
@@ -39,6 +39,7 @@ |
| 31 |
myrecipient = "root@localhost" |
| 32 |
|
| 33 |
myfrom = mysettings["PORTAGE_ELOG_MAILFROM"] |
| 34 |
+ myfrom = myfrom.replace("${HOST}", socket.getfqdn()) |
| 35 |
mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] |
| 36 |
mysubject = mysubject.replace("${PACKAGE}", count) |
| 37 |
mysubject = mysubject.replace("${HOST}", socket.getfqdn()) |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives