Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-more-emails into lp:ubuntu-archive-tools

[Brian Murray]

The halted phased-update of plasma-workspace in zesty only sent an email notification to Rik Mills, who sponsored the patch, and not Jose Manuel Santamaria Lema whose work was sponsored. Digging into this I discovered that Jose has a hidden email address and we were not doing a great job of falling back to using the email address that appears in the changes file. This upload fixes that, while testing the upload I discovered that only 3 or 4 SRUs ended up in this situation (where only one person was emailed instead of two).

While I was looking at the code I also fixed a lack of error handling trying to grab the changes file, and dropped some end of life releases.

=== modified file 'phased-updater'
--- phased-updater	2017-06-02 21:57:06 +0000
+++ phased-updater	2017-09-12 23:25:28 +0000
@@ -257,26 +257,32 @@
                 logging.info('%s not mailed as they are not a valid LP user' %
                              signer)
                 continue
-            pkg = spph.source_package_name
-            version = spph.source_package_version
             signer_email = get_primary_email(signer)
-            if not signer_email:
-                signer_name = ''
-                # if we can't determine their email use the changes file
-                changes_file_url = spph.changesFileUrl()
-                # need to handle a 404 here
+            signer_name = signer.name
+            # use the changes file as a backup method for determining email addresses
+            changes_file_url = spph.changesFileUrl()
+            try:
                 changes_file = urlopen(changes_file_url)
                 for line in changes_file.readlines():
                     line = line.strip()
                     if line.startswith('Changed-By:'):
                         changer = line.lstrip('Changed-By: ').decode('utf-8')
-                        signer_name, signer_email = utils.parseaddr(changer.strip())
+                        changer_name, changer_email = utils.parseaddr(changer.strip())
                         break
-                logging.info("Used changes file to find email for %s %s %s" %
+            except IOError:
+                pass
+            creator = spph.package_creator
+            creator_email = ''
+            pkg = spph.source_package_name
+            version = spph.source_package_version
+            if not signer_email and signer_name == creator.name:
+                if not changer_email:
+                    logging.info("No contact email found for %s %s %s" %
+                                 (rname, pkg, version))
+                    continue
+                signer_email = changer_email
+                logging.info("Used changes file to find contact email for %s %s %s" %
                              (rname, pkg, version))
-            else:
-                signer_name = signer.name
-            changer = spph.package_creator
             if 'buckets' in spph_buckets[rname][spph]:
                 # see if they've been emailed about the bucket before
                 notices = []
@@ -306,11 +312,13 @@
                 msg['Reply-To'] = bdmurray_mail
                 receivers.append(signer_email)
                 msg['To'] = signer_email
-                if changer != signer and changer.is_valid:
-                    changer_email = get_primary_email(changer)
-                    if changer_email:
-                        receivers.append(changer_email)
-                        msg['Cc'] = '%s' % changer_email
+                if creator != signer and creator.is_valid:
+                    creator_email = get_primary_email(creator)
+                    # fall back to the email found in the changes file
+                    if not creator_email:
+                        creator_email = changer_email
+                    receivers.append(creator_email)
+                    msg['Cc'] = '%s' % changer_email
                 smtp = smtplib.SMTP('localhost')
                 smtp.sendmail(EMAIL_SENDER, receivers,
                               msg.as_string())
@@ -322,6 +330,10 @@
                         notify_file.write('%s, %s, %s, %s\n' % \
                                           (signer_name, bucket,
                                            pkg, version))
+                        if changer_email:
+                            notify_file.write('%s, %s, %s, %s\n' % \
+                                              (creator.name, bucket,
+                                               pkg, version))
             if 'rate' in spph_buckets[rname][spph]:
                 # see if they have been emailed about the increased rate
                 # for this package version before
@@ -340,11 +352,12 @@
                 msg['Reply-To'] = bdmurray_mail
                 receivers.append(signer_email)
                 msg['To'] = signer_email
-                if changer != signer and changer.is_valid:
-                    changer_email = get_primary_email(changer)
-                    if changer_email:
-                        receivers.append(changer_email)
-                        msg['Cc'] = '%s' % changer_email
+                if creator != signer and creator.is_valid:
+                    # fall back to the email found in the changes file
+                    if not creator_email:
+                        creator_email = changer_email
+                    receivers.append(creator_email)
+                    msg['Cc'] = '%s' % creator_email
                 smtp = smtplib.SMTP('localhost')
                 smtp.sendmail(EMAIL_SENDER, receivers,
                               msg.as_string())
@@ -355,6 +368,9 @@
                 with codecs.open(NOTIFICATIONS, 'a', encoding='utf-8') as notify_file:
                     notify_file.write('%s, increased-rate, %s, %s\n' %
                                       (signer_name, pkg, version))
+                    if creator_email:
+                        notify_file.write('%s, increased-rate, %s, %s\n' %
+                                          (creator.name, pkg, version))
 
 
 def new_buckets(archive, release, src_pkg, version):
@@ -579,7 +595,7 @@
         rvers = release.version
         issues[rname] = OrderedDict()
         # XXX - starting with raring
-        if rname in ['lucid', 'precise', 'vivid', 'wily']:
+        if rname in ['precise', 'vivid']:
             continue
         pub_sources = archive.getPublishedSources(
             created_since_date=cdate,