Merge lp:~laney/ubuntu-archive-scripts/generate-team-p-m-binary into lp:ubuntu-archive-scripts

[Iain Lane]

[Sebastien Bacher (seb128)]

Looks fine to me, thanks for fixing it!

review: Approve

[lp:~laney/ubuntu-archive-scripts/generate-team-p-m-binary]

272. By Iain Lane on 2020-04-07

generate-team-p-m: Attribute binary-only migration items to the right team

We need to split on the / and look the first part (package name) up in the
mapping

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'generate-team-p-m'
--- generate-team-p-m	2020-03-19 15:07:56 +0000
+++ generate-team-p-m	2020-04-07 10:03:31 +0000
@@ -206,7 +206,10 @@
         if self._age is not None:
             return self._age
         else:
-            return self.data["policy_info"]["age"]["current-age"]
+            try:
+                return self.data["policy_info"]["age"]["current-age"]
+            except KeyError:
+                return -1
 
     @age.setter
     def age(self, val):
@@ -249,7 +252,7 @@
         # Missing component means main
         if item.get('component', 'main') not in components:
             continue
-        prob = Problem(kind='package-in-proposed', data=item, package_in_proposed=source_package_name)
+        prob = Problem(kind='package-in-proposed', data=defaultdict(dict, item), package_in_proposed=source_package_name)
         in_proposed_packages[source_package_name] = prob
         prob.regressions = []
         prob.waiting = []
@@ -280,7 +283,9 @@
     package_to_problems = defaultdict(list)
 
     for problem in in_proposed_packages.values():
-        package_to_problems[problem.package_in_proposed].append(problem)
+        # nautilus/riscv64 -> nautilus
+        pkg = problem.package_in_proposed.split('/')[0]
+        package_to_problems[pkg].append(problem)
         for regression in problem.regressions:
             if regression.blocking not in in_proposed_packages:
                 continue
@@ -307,7 +312,8 @@
     else:
         subscribers = get_subscribers_json(set(package_to_problems), args.subscribers_json)
         for p in set(package_to_problems):
-            if p not in subscribers:
+            pkg = p.split('/')[0]
+            if pkg not in subscribers:
                 subscribers[p] = ['unknown']
 
     all_teams = set()
 
=== modified file 'templates/team-report.html'
--- templates/team-report.html	2020-03-05 10:14:14 +0000
+++ templates/team-report.html	2020-04-07 10:03:31 +0000
@@ -43,7 +43,11 @@
         {% else %}
         in proposed for
         {% endif %}
+        {% if prob.age == -1 %}
+        an unknown number of days
+        {% else %}
         {{ ngettext("%(num)d day", "%(num)d days", prob.age|int) }}
+        {% endif %}
         <ul>
           {% if d["policy_info"]["update-excuse"] %}
           <li>Excuses bugs: