Support ${HOST} substitution in "From" field. Thanks to wschlich.

svn path=/main/trunk/; revision=9510

diff --git a/pym/portage/elog/mod_mail.py b/pym/portage/elog/mod_mail.py
index 922ea08465edb474f9ada34af0b1fc9c5240cc1e..09e3db22dcd7d321c23de5fe1db152ce23ac7757 100644 (file)
--- a/pym/portage/elog/mod_mail.py
+++ b/pym/portage/elog/mod_mail.py
@@ -14,6 +14,7 @@ def process(mysettings, key, logentries, fulltext):
                myrecipient = "root@localhost"
        
        myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
+       myfrom = myfrom.replace("${HOST}", socket.getfqdn())
        mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
        mysubject = mysubject.replace("${PACKAGE}", key)
        mysubject = mysubject.replace("${HOST}", socket.getfqdn())

diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index 2e870fe5deb58b441226ac8f0f8fc80f9a57530a..40a2484a637396547e7b267cb8e43f298c482db6 100644 (file)
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -39,6 +39,7 @@ def _finalize(mysettings, items):
                myrecipient = "root@localhost"
        
        myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
+       myfrom = myfrom.replace("${HOST}", socket.getfqdn())
        mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
        mysubject = mysubject.replace("${PACKAGE}", count)
        mysubject = mysubject.replace("${HOST}", socket.getfqdn())