Merge lp:~xnox/ubuntu-archive-tools/riscv64 into lp:ubuntu-archive-tools

[Dimitri John Ledkov]

Correctly add riscv64 to components-mismatches

untested, no unsplit mirror

Correctly add riscv64 to components-mismatches

untested, no unsplit mirror

[Matthias Klose (doko)]

done

review: Approve

[Dimitri John Ledkov (xnox)]

Please mark this as merged in rev 1311, i think it got rebased.

=== modified file 'component-mismatches'
--- component-mismatches	2020-04-16 15:42:24 +0000
+++ component-mismatches	2020-04-20 11:07:46 +0000
@@ -136,9 +136,7 @@
         components_with_di.append('%s/debian-installer' % component)
     for suite in options.suites:
         for component in components_with_di:
-            for arch in [
-                    "i386", "amd64", "armhf", "arm64", "ppc64el", "riscv64"
-                    "s390x"]:
+            for arch in options.architectures:
                 binaries_path = "%s/dists/%s/%s/binary-%s/Packages.gz" % (
                     options.archive_dir, suite, component, arch)
                 for section in apt_pkg.TagFile(decompress_open(binaries_path)):
@@ -179,8 +177,7 @@
         # ideally supported+build-depends too, but Launchpad's
         # cron.germinate doesn't save this
 
-        for arch in ["i386", "amd64", "armhf", "arm64", "ppc64el",
-                     "s390x"]:
+        for arch in options.architectures:
             for seed in seeds:
                 filename = "%s/%s_%s_%s_%s" % (
                     options.germinate_path, seed, flavour, options.suite, arch)
@@ -878,6 +875,9 @@
     else:
         options.suites = [options.suite]
 
+    options.series = options.distro.getSeries(name_or_version=options.suites[0])
+    options.architectures = [a.architecture_tag for a in options.series.architectures]
+
     if options.output_file is not None:
         sys.stdout = open('%s.new' % options.output_file, 'w')
     if options.html_output_file is not None: