Merge lp:~vorlon/ubuntu-archive-tools/autopkgtest-retry-order-by-package-not-arch into lp:ubuntu-archive-tools

[Steve Langasek]

[Andy Whitcroft (apw)]

Reasoning for this change is sound when bulk loading from scratch into empty queues. The code change looks reasonable enough. One small documentation issue inline below.

=== modified file 'retry-autopkgtest-regressions'
--- retry-autopkgtest-regressions	2017-04-21 21:01:24 +0000
+++ retry-autopkgtest-regressions	2017-08-01 20:19:13 +0000
@@ -88,7 +88,7 @@
             for arch, state in archinfo.items():
                 if state[0] == retry_state:
                     regressions.setdefault(release, {}).setdefault(
-                        arch, {}).setdefault(pkg, []).append(trigger)
+                        pkg, {}).setdefault(arch, []).append(trigger)
 
     return regressions
 
@@ -120,9 +120,9 @@
 regressions = get_regressions(excuses_url, args.series, args.state,
                               args.min_age, args.max_age)
 
-for release, archmap in regressions.items():
-    for arch, pkgmap in archmap.items():
-        for pkg, triggers in pkgmap.items():
+for release, pkgmap in regressions.items():
+    for pkg, archmap in pkgmap.items():
+        for arch, triggers in archmap.items():
             params = [('release', release), ('arch', arch), ('package', pkg)]
             params += [('trigger', t) for t in triggers]
             params += extra_params