Merge lp:~brian-murray/ubuntu-archive-tools/component-mismatches-uploader into lp:ubuntu-archive-tools

[Brian Murray]

This adds "(Uploader: launchpad username)" to lines in the html version of the component mismatches report. See this following page for an example:

http://people.canonical.com/~brian/tmp/component-mismatches.html

The guessing at package names (lines 303-312), and displaying them (lines 538-551) is rather messy but does work and is minimally invasive. Having said that I'm open to suggestions on how to do either or both better.

=== modified file 'component-mismatches'
--- component-mismatches	2015-03-12 16:50:13 +0000
+++ component-mismatches	2015-03-19 21:44:48 +0000
@@ -248,7 +248,35 @@
     return current_binary[binary][2]
 
 
-def do_reverse(source, binaries, why_d):
+def find_signer(options, source):
+    # look at the source package publishing history for the most recent
+    # package_signer, a copy from debian won't have a package signer
+    series = options.distro.getSeries(name_or_version=options.suite)
+    publications = options.archive.getPublishedSources(
+        distro_series=series, source_name=source,
+        exact_match=True)
+    if not publications:
+        return('no publications found', '')
+    sorted_pubs = sorted([(ps.date_published, ps)
+                          for ps in publications
+                          if ps.date_published is not None], reverse=True)
+    for pub in sorted_pubs:
+        if pub[1].package_signer:
+            signer = pub[1].package_signer.name
+            web_link = pub[1].package_signer.web_link
+            return(signer, web_link)
+        else:
+            signer = ''
+            web_link = ''
+    return (signer, web_link)
+
+
+def do_reverse(options, source, binaries, why_d):
+    global signers
+    try:
+        signers.keys()
+    except NameError:
+        signers = {}
     output = []
     depend = {}
     recommend = {}
@@ -267,6 +295,21 @@
     def do_category(map, category):
         keys = []
         for k in map:
+            if k.startswith('Rescued from '):
+                pkg = k.replace('Rescued from ', '')
+            else:
+                pkg = k
+            # seed names have spaces in them
+            if ' ' not in pkg:
+                try:
+                    source = get_source(pkg)
+                except KeyError:
+                    source = pkg
+                    pass
+                if source not in signers:
+                    signer, web_link = find_signer(options, source)
+                    if signer and web_link:
+                        signers[source] = (signer, web_link)
             if k in current_binary:
                 keys.append('%s (%s)' % (k, current_binary[k][1].upper()))
             elif k in current_source:
@@ -328,7 +371,7 @@
                 written_nodes.add(name)
 
                 fd.write('  "%s" [label="%s" style="filled" tooltip="%s"' %
-                    (name, name, ', '.join(package_team_mapping[name])))
+                         (name, name, ', '.join(package_team_mapping[name])))
 
                 mirs = mir_bugs.get(name, [])
                 approved_mirs = [
@@ -367,7 +410,7 @@
             # generate relation
             fd.write('  "%s" -> "%s" [label="%s" color="%s" '
                      'fontcolor="%s"]\n' %
-                    (why_node, s_node, relation, color, color))
+                     (why_node, s_node, relation, color, color))
 
     # add legend
     fd.write("""
@@ -412,6 +455,7 @@
 
 package_team_mapping = defaultdict(set)
 
+
 def get_teams(options, source):
     global package_team_mapping
 
@@ -491,6 +535,20 @@
                 if isinstance(line, MIRLink):
                     line = line.html()
                 else:
+                    for item in line.strip('[]').split(' '):
+                        if item.strip(',') in signers:
+                            comma = ''
+                            if item.endswith(','):
+                                comma = ','
+                                pkg = item.strip(',')
+                            else:
+                                pkg = item
+                            # neither of these will help fix the issue
+                            if signers[pkg][0] in ['ps-jenkins',
+                                                   'ci-train-bot']:
+                                continue
+                            line = line.replace(item, '%s (Uploader: %s)%s' %
+                                                (pkg, signers[pkg][0], comma))
                     line = escape(line)
                 print_html(
                     '<tr><td colspan="2"><span class="note">%s'
@@ -541,10 +599,8 @@
             </head>
             <body>
             <h1>Component mismatches for %s</h1>
-            """) % (
-                escape(options.suite), make_chart_header(),
-                escape(options.suite)),
-            file=options.html_output)
+            """) % (escape(options.suite), make_chart_header(),
+                    escape(options.suite)), file=options.html_output)
 
     # Additions
 
@@ -582,7 +638,7 @@
             for (id, status, title) in mir_bugs.get(source, []):
                 entry.append(MIRLink(id, status, title))
 
-            entry.extend(do_reverse(source, binaries, both))
+            entry.extend(do_reverse(options, source, binaries, both))
             output.append(entry)
 
         all_output["Source and binary movements to %s" % component] = {
@@ -597,7 +653,8 @@
 
             if binaries:
                 entry = [[source] + binaries]
-                entry.extend(do_reverse(source, binaries, binary_only))
+                entry.extend(do_reverse(options, source, binaries,
+                             binary_only))
                 output.append(entry)
 
         all_output["Binary only movements to %s" % component] = {
@@ -784,6 +841,7 @@
     options.launchpad = Launchpad.login_anonymously(
         'component-mismatches', options.launchpad_instance)
     options.distro = options.launchpad.distributions['ubuntu']
+    options.archive = options.distro.getArchive(name='primary')
 
     options.archive_dir = os.path.expanduser('~/mirror/ubuntu/')