Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-notify-bdmurray into lp:ubuntu-archive-tools

Proposed by Brian Murray
Status: Merged
Merged at revision: 794
Proposed branch: lp:~brian-murray/ubuntu-archive-tools/phased-updater-notify-bdmurray
Merge into: lp:ubuntu-archive-tools
Diff against target: 44 lines (+5/-2)
1 file modified
phased-updater (+5/-2)
To merge this branch: bzr merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-notify-bdmurray
Reviewer Review Type Date Requested Status
Ubuntu Package Archive Administrators Pending
Review via email: mp+193950@code.launchpad.net

Description of the change

It was suggested to me that the Reply-To header be set so that it is easier for people to ask for overrides of problems. This branch adds that and also CC's me when an update is stopped.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'phased-updater'
--- phased-updater 2013-10-25 19:32:07 +0000
+++ phased-updater 2013-11-05 16:11:59 +0000
@@ -211,6 +211,7 @@
211 notifications[person].append((problem, pkg, pkg_version))211 notifications[person].append((problem, pkg, pkg_version))
212 except IOError:212 except IOError:
213 pass213 pass
214 bdmurray_mail = 'brian@ubuntu.com'
214 b_body = ('Your upload of %s version %s to %s has resulted in %s'215 b_body = ('Your upload of %s version %s to %s has resulted in %s'
215 'error%s that %s first reported about this version of the '216 'error%s that %s first reported about this version of the '
216 'package. The error%s follow%s:\n\n'217 'package. The error%s follow%s:\n\n'
@@ -261,7 +262,7 @@
261 spph_buckets[rname][spph]['buckets'].remove(notice)262 spph_buckets[rname][spph]['buckets'].remove(notice)
262 if len(spph_buckets[rname][spph]['buckets']) == 0:263 if len(spph_buckets[rname][spph]['buckets']) == 0:
263 continue264 continue
264 receivers = []265 receivers = ['%s' % bdmurray_mail]
265 quantity = len(spph_buckets[rname][spph]['buckets'])266 quantity = len(spph_buckets[rname][spph]['buckets'])
266 msg = MIMEText(267 msg = MIMEText(
267 b_body % (pkg, version, rname, ('an ', '')[quantity != 1],268 b_body % (pkg, version, rname, ('an ', '')[quantity != 1],
@@ -274,6 +275,7 @@
274 subject = '[%s/%s] Possible Regression' % (rname, pkg)275 subject = '[%s/%s] Possible Regression' % (rname, pkg)
275 msg['Subject'] = subject276 msg['Subject'] = subject
276 msg['From'] = EMAIL_SENDER277 msg['From'] = EMAIL_SENDER
278 msg['Reply-To'] = bdmurray_mail
277 receivers.append(signer_email)279 receivers.append(signer_email)
278 msg['To'] = signer_email280 msg['To'] = signer_email
279 if changer != signer and changer.is_valid:281 if changer != signer and changer.is_valid:
@@ -299,13 +301,14 @@
299 notices = notifications[signer_name]301 notices = notifications[signer_name]
300 if ('increased-rate', pkg, version) in notices:302 if ('increased-rate', pkg, version) in notices:
301 continue303 continue
302 receivers = []304 receivers = ['%s' % bdmurray_mail]
303 msg = MIMEText(i_body % (pkg, version, rname,305 msg = MIMEText(i_body % (pkg, version, rname,
304 spph_buckets[rname][spph]['rate'][1])306 spph_buckets[rname][spph]['rate'][1])
305 + remedy)307 + remedy)
306 subject = '[%s/%s] Increase in crash rate' % (rname, pkg)308 subject = '[%s/%s] Increase in crash rate' % (rname, pkg)
307 msg['Subject'] = subject309 msg['Subject'] = subject
308 msg['From'] = EMAIL_SENDER310 msg['From'] = EMAIL_SENDER
311 msg['Reply-To'] = bdmurray_mail
309 receivers.append(signer_email)312 receivers.append(signer_email)
310 msg['To'] = signer_email313 msg['To'] = signer_email
311 if changer != signer and changer.is_valid:314 if changer != signer and changer.is_valid:

Subscribers

People subscribed via source and target branches