bodhi/config/app.cfg | 3 +++
bodhi/jobs.py | 5 +++++
bodhi/masher.py | 13 +++++++++++++
3 files changed, 21 insertions(+)
New commits:
commit fa220a2bf07744dc169f805dedd7f01fb8647f09
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 15 10:27:34 2010 -0400
Display a list of security updates that need testing in our digest (#446)
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 4cd1b1f..fe26b4b 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -735,6 +735,14 @@ class MashTask(Thread):
updates.append(update)
return updates
+ def get_security_updates(self, release):
+ release = Release.select(Release.q.long_name==release)
+ return PackageUpdate.select(
+ AND(PackageUpdate.q.releaseID == release.id,
+ PackageUpdate.q.type == 'security',
+ PackageUpdate.q.status == 'testing',
+ PackageUpdate.q.request == None))
+
def send_digest_mail(self):
'''
Send digest mail to mailing lists
@@ -743,6 +751,11 @@ 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())
commit a98b07a63f73bbbaf165e58f397bc88548004d8a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 15 10:22:36 2010 -0400
Email the proventesters for unapproved critpath updates after 2 weeks
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 7498ac0..49b7884 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -80,6 +80,9 @@ security_team = None
# Superuser groups
admin_groups = 'proventesters security_respons'
+# The email address of the proventesters
+proventesters_email = 'proventesters-members(a)fedoraproject.org'
+
# Where do we send update announcements to ?
# These variables should be named per: Release.prefix_id.lower()_announce_list
fedora_announce_list = None
diff --git a/bodhi/jobs.py b/bodhi/jobs.py
index 0c3984f..b986aeb 100644
--- a/bodhi/jobs.py
+++ b/bodhi/jobs.py
@@ -86,6 +86,7 @@ def nagmail():
]
oldname = None
mail_admin = False
+ mail_proventesters = False
for name, query, date in queries:
for update in query:
@@ -105,6 +106,7 @@ def nagmail():
oldname = name
name = 'old_testing_critpath'
mail_admin = True
+ mail_proventesters = True
log.info("[%s] Nagging %s about %s" % (name, update.submitter,
update.title))
@@ -112,6 +114,9 @@ def nagmail():
if mail_admin:
mail.send_admin(name, update)
mail_admin = False
+ if mail_proventesters:
+ mail.send(config.get('proventesters_email'), name, update)
+ mail_proventesters = False
nagged[name] = datetime.utcnow()
update.nagged = nagged
Show replies by date