Merge lp:~vorlon/ubuntu-archive-publishing/lubuntu-next-support-fixup into lp:ubuntu-archive-publishing

[Steve Langasek]

take 2 of fixing the lubuntu seed supported fields

[Simon Quigley (tsimonq2)]

LGTM, iff it works.

review: Approve

[lp:~vorlon/ubuntu-archive-publishing/lubuntu-next-support-fixup]

104. By Steve Langasek on 2018-04-26

In order to special-case 'all' to not override previously-seen support lengths, we also need to process ubuntu (longest-supported) before any other flavors and should process lubuntu last.

105. By Steve Langasek on 2018-04-26

pull the main-but-unseeded default from SUPPORTED_TIMEFRAME explicitly, so that it always maps to Ubuntu support length instead of another flavor.

=== modified file 'scripts/maintenance-check.py'
--- scripts/maintenance-check.py	2018-04-12 17:11:31 +0000
+++ scripts/maintenance-check.py	2018-04-26 05:56:56 +0000
@@ -229,8 +229,8 @@
     SUPPORT_TIMEFRAME_SHORT = [
         ("3y", UbuntuMaintenance.SERVER_SEEDS),
         ("3y", UbuntuMaintenance.DESKTOP_SEEDS),
-        ("3y", UbuntuMaintenance.SUPPORTED_SEEDS),
         ("9m", NON_LTS_SEEDS),
+        ("3y", UbuntuMaintenance.SUPPORTED_SEEDS),
         ]
 
     # on an LTS this is significant, it defines what names get LTS support
@@ -240,11 +240,11 @@
 
     DISTRO_NAMES_SHORT = [
         "kubuntu",
-        "lubuntu",
         "ubuntu-budgie",
         "ubuntu-mate",
         "ubuntukylin",
         "xubuntu",
+        "lubuntu",
         ]
 
 # Names of the distribution releases that are not supported by this
@@ -466,7 +466,8 @@
                     pkg_support_time[pkg] = timeframe
                 else:
                     old_timeframe = pkg_support_time[pkg]
-                    if compare_support_level(old_timeframe, timeframe) < 0:
+                    if (seed != 'all'
+                        and compare_support_level(old_timeframe, timeframe) < 0):
                         logging.debug("overwriting %s from %s to %s" % (
                                 pkg, old_timeframe, timeframe))
                         pkg_support_time[pkg] = timeframe
@@ -520,8 +521,8 @@
     # go over the distros we need to check
     pkg_support_time = {}
     for names, support_timeframe in (
+            (ubuntu_maintenance.DISTRO_NAMES, ubuntu_maintenance.SUPPORT_TIMEFRAME),
             (ubuntu_maintenance.DISTRO_NAMES_SHORT, ubuntu_maintenance.SUPPORT_TIMEFRAME_SHORT),
-            (ubuntu_maintenance.DISTRO_NAMES, ubuntu_maintenance.SUPPORT_TIMEFRAME),
             ):
         for name in names:
             # get basic structure file
@@ -551,7 +552,8 @@
             if ":" in pkg.name:
                 continue
             if not pkg.name in pkg_support_time:
-                pkg_support_time[pkg.name] = support_timeframe[-1][0]
+                pkg_support_time[pkg.name] = \
+                    ubuntu_maintenance.SUPPORT_TIMEFRAME[-1][0]
                 logging.warn(
                     "add package in main but not in seeds %s with %s" % (
                         pkg.name, pkg_support_time[pkg.name]))