Merge lp:~brian-murray/ubuntu-archive-tools/phasing-progress-link into lp:ubuntu-archive-tools

[Brian Murray]

I thought it'd be helpful to make uploaders more aware of the phasing report by including it in the email to them.

[Steve Langasek (vorlon)]

minor suggested change inline.

review: Needs Fixing

[lp:~brian-murray/ubuntu-archive-tools/phasing-progress-link]

941. By Brian Murray on 2015-03-02

phased-updater: add and extra \n

[Brian Murray (brian-murray)]

Okay, fixed.

=== modified file 'phased-updater'
--- phased-updater	2015-02-27 16:11:38 +0000
+++ phased-updater	2015-03-02 22:20:22 +0000
@@ -193,8 +193,8 @@
         report.write('''</body>\n''')
         report.write('''</html>''')
         report.flush()
-        shutil.copy2(report.name, '%s/phased-updates.html' % os.getcwd())
-        os.chmod('%s/phased-updates.html' % os.getcwd(), 0o644)
+        shutil.copy2(report.name, '%s/%s' % (os.getcwd(), REPORT_FILE))
+        os.chmod('%s/%s' % (os.getcwd(), REPORT_FILE), 0o644)
 
 
 def create_email_notifications(releases, spph_buckets):
@@ -223,12 +223,15 @@
               'to the previous two weeks. For problems currently being '
               'reported about the package see:\n\n'
               '%s\n\n')
-    remedy = ('Further phasing of this update has been stopped until the '
+    remedy = ('You can view the current status of the phasing of all '
+              'Stable Release Updates, including yours, at:\n\n'
+              'http://people.canonical.com/~ubuntu-archive/%s\n\n'
+              'Further phasing of this update has been stopped until the '
               'errors have either been fixed or determined to not be a '
               'result of this Stable Release Update.  In the event of '
               'the latter please let a member of the Ubuntu Stable Release '
               'Updates team (~ubuntu-sru) know so that phasing of the update '
-              'can proceed.')
+              'can proceed.' % (REPORT_FILE))
     for release in releases:
         rname = release.name
         for spph in spph_buckets[rname]:
@@ -618,6 +621,7 @@
     NOTIFICATIONS = 'phased-updates-emails.txt'
     EMAIL_SENDER = '[e-mail]'
     PUP_INCREMENT = 10
+    REPORT_FILE = 'phased-updates.html'
     parser = OptionParser(usage="usage: %prog [options]")
     parser.add_option(
         "-l", "--launchpad", dest="launchpad_instance", default="production")