bodhi/masher.py | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 29bb7c5db6097ce8c8a977984cd4afeed1e98e81
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 22 15:31:12 2010 -0400
Fix a bug in the formatting of the security/critpath updates in the testing digest
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 744d7a9..13bb769 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -793,15 +793,19 @@ class MashTask(Thread):
log.debug("Sending digest for updates-testing %s" % prefix)
maildata = u''
try:
- maildata += u'The following %s Security updates need
testing:\n\n' % prefix
- for update in self.get_security_updates(prefix):
- maildata += u' %s\n' % config.get('base_address')
+ url(update.get_url())
- maildata += '\n\n'
-
- maildata += u'The following %s Critical Path updates have yet to be
approved:\n\n' % prefix
- for update in self.get_unapproved_critpath_updates(prefix):
- maildata += u' %s\n' % config.get('base_address')
+ url(update.get_url())
- maildata += '\n\n'
+ security_updates = self.get_security_updates(prefix)
+ if security_updates:
+ maildata += u'The following %s Security updates need
testing:\n\n' % prefix
+ for update in security_updates:
+ maildata += u' %s\n' %
(config.get('base_address') + url(update.get_url()))
+ maildata += '\n\n'
+
+ critpath_updates = self.get_unapproved_critpath_updates(prefix)
+ if critpath_updates:
+ maildata += u'The following %s Critical Path updates have yet to
be approved:\n\n' % prefix
+ for update in self.get_unapproved_critpath_updates(prefix):
+ maildata += u' %s\n' %
(config.get('base_address') + url(update.get_url()))
+ maildata += '\n\n'
except Exception, e:
log.exception(e)
Show replies by date