backend/satellite_tools/satsync.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8d77bc5d25d798173e9ea7092fd1a70d30b720df
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Mar 11 17:37:06 2011 +0100
set envelope From to traceback email
This is relict from BZ 132067
addressing:
Standard-error: ERROR: upon attempt to write to log file: 'ascii' codec
can't encode character u'\u017e' in position 65: ordinal not in
range(128)ERROR: upon attempt to write to log file: 'ascii' codec can't encode
character u'\u017e' in position 119: ordinal not in range(128)Traceback (most
recent call last):
File "/usr/bin/satellite-sync", line 175, in ?
systemExit_exception(7, "SYNC ERROR: attempting to display as much
information as possible:", e)
File "/usr/bin/satellite-sync", line 125, in systemExit_exception
satsync.sendMail(forceEmail=1)
File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/satsync.py", line
362, in sendMail
rhnMail.send(headers, body, sender=sndr)
File "/usr/lib/python2.4/site-packages/spacewalk/common/rhnMail.py", line
57, in send
server.sendmail(sender, toaddrs, "%s\n%s\n" % (joined_headers, body))
File "/usr/lib64/python2.4/smtplib.py", line 680, in sendmail
raise SMTPSenderRefused(code, resp, from_addr)
smtplib.SMTPSenderRefused: (553, '5.5.4 <rhn-satellite>... Domain name
required for sender address rhn-satellite', 'rhn-satellite')
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1506242..073736b 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -357,8 +357,7 @@ def sendMail(forceEmail=0):
headers = {
'Subject' : _('RHN Management Satellite sync. report from
%s') % os.uname()[1],
}
- #sndr = CFG.get('traceback_mail', 'rhn-satellite')
- sndr = 'rhn-satellite'
+ sndr = CFG.get('traceback_mail', 'root@localhost')
rhnMail.send(headers, body, sender=sndr)
else:
print _("+++ email requested, but there is nothing to send +++")
Show replies by date