yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osclib/util: mail_send(): allow a from_key of None to indicate osc user.

Browse Source
This commit is contained in:
Jimmy Berry 2019-03-05 08:40:47 -06:00
parent 4dbcc5bc40
commit 0c1fa52c54
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osclib/util.py
View File

@ -1,5 +1,6 @@
from osc import conf from osc import conf
from osclib.conf import Config from osclib.conf import Config
from osclib.core import entity_email
from osclib.core import project_list_prefix from osclib.core import project_list_prefix
from osclib.memoize import memoize from osclib.memoize import memoize
@ -132,7 +133,10 @@ def mail_send(apiurl, project, to, subject, body, from_key='maintainer',
msg = MIMEText(body) msg = MIMEText(body)
msg['Message-ID'] = email.utils.make_msgid() msg['Message-ID'] = email.utils.make_msgid()
msg['Date'] = email.utils.formatdate(localtime=1) msg['Date'] = email.utils.formatdate(localtime=1)
msg['From'] = config['mail-{}'.format(from_key)] if from_key is None:
msg['From'] = entity_email(apiurl, conf.get_apiurl_usr(apiurl), include_name=True)
else:
msg['From'] = config['mail-{}'.format(from_key)]
if '@' not in to: if '@' not in to:
to = config['mail-{}'.format(to)] to = config['mail-{}'.format(to)]
msg['To'] = to msg['To'] = to