bodhi/mail.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit 55bcd17c9f544f9790077568ec11565f7ddcb6c5 Author: Luke Macken lmacken@redhat.com Date: Thu Jun 9 21:11:17 2011 -0400
remove unused module
diff --git a/bodhi/mail.py b/bodhi/mail.py index b2d3010..e84fdee 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -16,7 +16,6 @@ import rpm import logging import turbomail
-from textwrap import wrap from turbogears import config, identity
from bodhi.util import rpm_fileheader, to_unicode
commit 2e0257f3b3f943ff2b23386a9acaa85d121b5d80 Author: Luke Macken lmacken@redhat.com Date: Thu Jun 9 21:10:58 2011 -0400
Make our mail.send() method work with our new override objects, as well as updates
diff --git a/bodhi/mail.py b/bodhi/mail.py index 8ac4f72..b2d3010 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -458,10 +458,12 @@ def send(to, msg_type, update, sender=None): return if type(to) not in (list, set, tuple): to = [to] + critpath = getattr(update, 'critpath', False) and '[CRITPATH] ' or '' + title = getattr(update, 'title', getattr(update, 'build', '')) for person in to: send_mail(sender, person, '[Fedora Update] %s[%s] %s' % ( - update.critpath and '[CRITPATH] ' or '', - msg_type, update.title), messages[msg_type]['body'] % + critpath, msg_type, title), + messages[msg_type]['body'] % messages[msg_type]['fields'](update))
def send_releng(subject, body):