Merge lp:~wgrant/lp-ftbfs-report/customise-archs into lp:lp-ftbfs-report

[William Grant]

Allow commandline customisation of shown architectures.

Drop multi-series support, allow manual specification of archs on the commandline, and automatically work out main/ports.

This is preparatory work for rebuild support.

=== modified file 'source/build_status.html'
--- source/build_status.html	2011-10-07 03:30:31 +0000
+++ source/build_status.html	2011-10-07 03:30:31 +0000
@@ -36,8 +36,12 @@
                     <th rowspan="2">Version</th>
                     <th rowspan="2" onmouseover="Tip('{{ set_tooltip }}')"
                         onmouseout="UnTip()">Set?</th>
-                    <th colspan="2" class="center">Main archive</th>
-                    <th colspan="2" class="center">Ports archive</th>
+                    {% if archs_by_archive['main'] %}
+                    <th colspan="{{ archs_by_archive['main']|count }}" class="center">Main archive</th>
+                    {% endif %}
+                    {% if archs_by_archive['ports'] %}
+                    <th colspan="{{ archs_by_archive['ports']|count }}" class="center">Ports archive</th>
+                    {% endif %}
                     <th rowspan="2"/>Bugs</th>
                     <th rowspan="2"/>
                 </tr>
@@ -152,8 +156,12 @@
         <thead>
             <tr>
                 <th colspan="2" rowspan="2">Failure type</th>
-                <th colspan="2" class="center">Main archive</th>
-                <th colspan="2" class="center">Ports archive</th>
+                {% if archs_by_archive['main'] %}
+                <th colspan="{{ archs_by_archive['main']|count }}" class="center">Main archive</th>
+                {% endif %}
+                {% if archs_by_archive['ports'] %}
+                <th colspan="{{ archs_by_archive['ports']|count }}" class="center">Ports archive</th>
+                {% endif %}
             </tr>
             <tr>
                 {% for arch in arch_list -%}
 
=== modified file 'source/build_status.py'
--- source/build_status.py	2011-10-07 03:30:31 +0000
+++ source/build_status.py	2011-10-07 03:30:31 +0000
@@ -31,7 +31,7 @@
 
 lp_service = 'production'
 api_version = '1.0'
-default_arch_list = ('i386', 'amd64', 'armel', 'powerpc')
+default_arch_list = []
 find_tagged_bugs = 'ftbfs'
 apt_pkg.InitSystem()
 
@@ -230,7 +230,7 @@
 
     return cur_last_published
 
-def generate_page(series, template = 'build_status.html', arch_list = default_arch_list):
+def generate_page(series, archs_by_archive, template = 'build_status.html', arch_list = default_arch_list):
     try:
         out = open('../%s.html' % series.name, 'w')
     except IOError:
@@ -274,6 +274,7 @@
     data['series'] = series
     data['active_series_list'] = active_series_list
     data['arch_list'] = arch_list
+    data['archs_by_archive'] = archs_by_archive
     data['lastupdate'] = time.strftime('%F %T %z')
     data['packagesets'] = packagesets_ftbfs
 
@@ -335,17 +336,20 @@
     ubuntu = launchpad.distributions['ubuntu']
     active_series_list = sorted([s for s in ubuntu.series if s.active], key = attrgetter('name'))
 
-    if len(sys.argv) > 1:
-        series_list = []
-        for i in sys.argv[1:]:
-            try:
-                series_list.append(ubuntu.getSeries(name_or_version = i))
-            except HTTPError:
-                print 'Error: %s is not a valid name or version' % i
-        series_list.sort(key = attrgetter('name'))
-
-    else:
-        series_list = (ubuntu.current_series,)
+    assert len(sys.argv) >= 3
+
+    try:
+        series_list = [ubuntu.getSeries(name_or_version = sys.argv[1])]
+    except HTTPError:
+        print 'Error: %s is not a valid name or version' % sys.argv[1]
+        sys.exit(1)
+
+    archs_by_archive = dict(main=[], ports=[])
+    for arch in sys.argv[2:]:
+        das = series_list[0].getDistroArchSeries(archtag=arch)
+        archs_by_archive[das.official and 'main' or 'ports'].append(arch)
+    default_arch_list.extend(archs_by_archive['main'])
+    default_arch_list.extend(archs_by_archive['ports'])
 
     for series in series_list:
         print "Generating FTBFS for %s" % series.fullseriesname
@@ -378,6 +382,6 @@
         save_timestamps(series, last_published)
 
         print "Generating HTML page..."
-        generate_page(series)
+        generate_page(series, archs_by_archive)
         print "Generating CSV file..."
         generate_csvfile(series)