Merge lp:~brian-murray/ubuntu-archive-tools/sru-report-uploaders into lp:ubuntu-archive-tools

[Brian Murray]

I realized I read the sru-report sometimes looking for stuff I uploaded and just have to try and remember what packages I uploaded which is ripe for failure. I thought it'd be great if the report showed the package creator and signer so made that change.

It'll also be useful to nag people who haven't verified SRUs they uploaded. Just wait to you see the report, the names will surprise you!

=== modified file 'sru-report'
--- sru-report	2016-12-19 13:19:31 +0000
+++ sru-report	2017-03-01 22:14:19 +0000
@@ -64,6 +64,7 @@
     DEBUGLEVEL = logging.WARNING
 
 lp = None
+lp_url = None
 ubuntu = None
 archive = None
 releases = {}  # name -> distro_series
@@ -76,8 +77,13 @@
 def current_versions(distro_series, sourcename):
     '''Get current package versions
 
-    Return map {'release': version, 'updates': version, 'proposed': version,
-      'changesfiles': [urls_of_proposed_changes], 'published': proposed_date}
+    Return map {'release': version,
+                'updates': version,
+                'proposed': version,
+                'creator': proposed_creator,
+                'signer': proposed_signer,
+                'changesfiles': [urls_of_proposed_changes],
+                'published': proposed_date}
     '''
     global archive
 
@@ -105,6 +111,8 @@
         elif p_pocket == 'Proposed':
             history['changesfiles'].append(pub.changesFileUrl())
             history['published'] = p_date_pub
+            history['creator'] = pub.package_creator
+            history['signer'] = pub.package_signer
         logging.debug(
             '%s=%s published to %s/%s on %s' %
             (sourcename, p_srcpkg_version,
@@ -138,7 +146,7 @@
 
     js = ''
     for b in bugs:
-        js += "window.open('https://bugs.launchpad.net/bugs/%d');" % b
+        js += "window.open('%s/bugs/%d');" % (lp_url, b)
     return '<button onclick="%s">%s (%i)</button>' % (js, title, len(bugs))
 
 
@@ -255,7 +263,8 @@
             continue
         print('''<h3>%s</h3>
 <table id='%s'>
-  <tr><th>Package</th><th>-release</th><th>-updates</th><th>-proposed</th>
+  <tr><th>Package</th><th>-release</th><th>-updates</th>
+  <th>-proposed (signer, creator)</th>
   <th>changelog bugs</th><th>days</th></tr>''' % (release, release))
         for pkg, pub in sorted(pkg_index[release].iteritems(),
                                key=itemgetter(1)):
@@ -270,7 +279,7 @@
                 continue
 
             rpkg = srus[release][pkg]
-            lpurl = 'https://launchpad.net/ubuntu/+source/%s/' % pkg
+            pkgurl = '%s/ubuntu/+source/%s/' % (lp_url, pkg)
             age = (datetime.datetime.now() - rpkg['published'].replace(
                 tzinfo=None)).days
 
@@ -288,13 +297,20 @@
                     % autopkg_fails
 
             print('  <tr><td><a href="%s">%s</a>%s %s</td> ' %
-                  (lpurl, pkg, builds, autopkg_fails))
-            print('  <td><a href="%s">%s</a></td> ' %
-                  (lpurl + rpkg['release'], rpkg['release']))
-            print('  <td><a href="%s">%s</a></td> ' %
-                  (lpurl + rpkg['updates'], rpkg['updates']))
-            print('  <td><a href="%s">%s</a></td> ' %
-                  (lpurl + rpkg['proposed'], rpkg['proposed']))
+                  (pkgurl, pkg, builds, autopkg_fails))
+            print('  <td><a href="%s">%s</a></td> ' %
+                  (pkgurl + rpkg['release'], rpkg['release']))
+            print('  <td><a href="%s">%s</a></td> ' %
+                  (pkgurl + rpkg['updates'], rpkg['updates']))
+            signer = str(rpkg['signer']).split('~')[-1]
+            uploaders = '<a href="%s/~%s">%s</a>' % \
+                (lp_url, signer, signer)
+            if rpkg['creator'] and rpkg['creator'] != rpkg['signer']:
+                creator = str(rpkg['creator']).split('~')[-1]
+                uploaders += ', <a href="%s/~%s">%s</a>' % \
+                    (lp_url, creator, creator)
+            print('  <td><a href="%s">%s</a> (%s)</td> ' %
+                  (pkgurl + rpkg['proposed'], rpkg['proposed'], uploaders))
             print('  <td>')
             removable = True
             antique = False
@@ -370,9 +386,9 @@
                                     continue
                 cls += '"'
 
-                print('<a href="https://bugs.launchpad.net/bugs/%d" '
+                print('<a href="%s/bugs/%d" '
                       'title="%s" %s>#%d%s</a>' %
-                      (b, hover_text.replace('"', ''), cls, b,
+                      (lp_url, b, hover_text.replace('"', ''), cls, b,
                        '(hw)' if 'hw-specific' in t else ''))
             if antique and removable:
                 proposed_antique.append((releases[release].name, pkg,
@@ -394,12 +410,12 @@
         print('''<h3>%s</h3>
 <table>
   <tr><th>Package</th><th>-proposed</th><th>-security</th></tr>''' % pkg[0])
-        lpurl = 'https://launchpad.net/ubuntu/+source/%s/' % pkg[1]
+        pkgurl = '%s/ubuntu/+source/%s/' % (lp_url, pkg[1])
         (vprop, vsec) = (pkg[2]['proposed'], pkg[2]['security'])
         print('  <tr><th><a href="%s">%s</a></th> \
         <td><a href="%s">%s</a></td> \
         <td><a href="%s">%s</a></td></tr>' % (
-            lpurl, pkg[1], lpurl + vprop, vprop, lpurl + vsec, vsec))
+            pkgurl, pkg[1], pkgurl + vprop, vprop, pkgurl + vsec, vsec))
         print('</table>')
 
     print('''\
@@ -417,9 +433,9 @@
     <tr><th>Release</th><th>Unapproved</th><th>New</th></tr>''')
         for r in sorted(releases):
             new_url = (
-                'https://launchpad.net/ubuntu/%s/+queue?queue_state=0' % r)
+                '%s/ubuntu/%s/+queue?queue_state=0' % (lp_url, r))
             unapproved_url = (
-                'https://launchpad.net/ubuntu/%s/+queue?queue_state=1' % r)
+                '%s/ubuntu/%s/+queue?queue_state=1' % (lp_url, r))
             print('      <tr><td>%s</td><td><a href="%s">%s</a></td>'
                   '<td><a href="%s">%s</a></tr>' %
                   (r, unapproved_url,
@@ -564,10 +580,11 @@
 
 def lpinit():
     '''Init LP credentials, archive, distro list and sru-team members'''
-    global lp, ubuntu, archive, releases, ignored_commenters
+    global lp, lp_url, ubuntu, archive, releases, ignored_commenters
     logging.debug("Initializing LP Credentials")
     lp = Launchpad.login_anonymously('sru-report', 'production',
                                      version="devel")
+    lp_url = str(lp._root_uri).replace('api.', '').strip('devel/')
     ubuntu = lp.distributions['ubuntu']
     archive = ubuntu.getArchive(name='primary')
     for s in ubuntu.series: