Fix kernel updates for 4.15+ series

The name of the packages changed upstream:

linux-image-extra-VERSION-generic no longer exists,
linux-modules-extra-VERSION-generic is new.

Author: clefebvre

usr/lib/linuxmint/mintUpdate/checkAPT.py

@@ -40,6 +40,9 @@ def __init__(self, version):
 # nothing else is listed.
 PRIORITY_UPDATES = ['mintupdate', 'mint-upgrade-info']
 
+KERNEL_PKG_NAMES = ['linux-headers-VERSION', 'linux-headers-VERSION-generic', 'linux-image-VERSION-generic', 'linux-modules-VERSION-generic', 'linux-modules-extra-VERSION-generic']
+KERNEL_PKG_NAMES.append('linux-image-extra-VERSION-generic') # Naming convention in 16.04, until 4.15 series
+
 class APTCheck():
 
     def __init__(self):
@@ -119,7 +122,7 @@ def find_changes(self):
                 if 'linux-image-generic' in self.cache:
                     recommended_kernel = KernelVersion(self.cache['linux-image-generic'].candidate.version)
                     if (uname_kernel.numeric_representation <= recommended_kernel.numeric_representation):
-                        for pkgname in ['linux-headers-VERSION', 'linux-headers-VERSION-generic', 'linux-image-VERSION-generic', 'linux-image-extra-VERSION-generic']:
+                        for pkgname in KERNEL_PKG_NAMES:
                             pkgname = pkgname.replace('VERSION', recommended_kernel.std_version)
                             if pkgname in self.cache:
                                 pkg = self.cache[pkgname]
@@ -131,7 +134,7 @@ def find_changes(self):
                 if 'linux-image-generic-hwe-16.04' in self.cache:
                     recommended_kernel = KernelVersion(self.cache['linux-image-generic-hwe-16.04'].candidate.version)
                     if (uname_kernel.numeric_representation <= recommended_kernel.numeric_representation):
-                        for pkgname in ['linux-headers-VERSION', 'linux-headers-VERSION-generic', 'linux-image-VERSION-generic', 'linux-image-extra-VERSION-generic']:
+                        for pkgname in KERNEL_PKG_NAMES:
                             pkgname = pkgname.replace('VERSION', recommended_kernel.std_version)
                             if pkgname in self.cache:
                                 pkg = self.cache[pkgname]
@@ -149,7 +152,7 @@ def find_changes(self):
                         if kernel.numeric_representation > max_kernel.numeric_representation and kernel.series == max_kernel.series:
                             max_kernel = kernel
                 if max_kernel.numeric_representation != uname_kernel.numeric_representation:
-                    for pkgname in ['linux-headers-VERSION', 'linux-headers-VERSION-generic', 'linux-image-VERSION-generic', 'linux-image-extra-VERSION-generic']:
+                    for pkgname in KERNEL_PKG_NAMES:
                         pkgname = pkgname.replace('VERSION', max_kernel.std_version)
                         if pkgname in self.cache:
                             pkg = self.cache[pkgname]

usr/lib/linuxmint/mintUpdate/kernelwindow.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import apt
 import subprocess
 import os
 import re
@@ -16,6 +17,10 @@
 VERSION_GROUP = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL)
 INFO_GROUP = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL)
 
+# Kernel package names
+KERNEL_PKG_NAMES = ['linux-headers-VERSION', 'linux-headers-VERSION-generic', 'linux-image-VERSION-generic', 'linux-modules-VERSION-generic', 'linux-modules-extra-VERSION-generic']
+KERNEL_PKG_NAMES.append('linux-image-extra-VERSION-generic') # Naming convention in 16.04, until 4.15 series
+
 def list_header_func(row, before, user_data):
     if before and not row.get_header():
         row.set_header(Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL))
@@ -33,12 +38,19 @@ def run(self):
                 "--non-interactive", "--parent-window-id", "%s" % self.application.window.get_window().get_xid(), "-o", "Synaptic::closeZvt=true"]
         f = tempfile.NamedTemporaryFile()
 
-        for pkg in ['linux-headers-%s' % self.version, 'linux-headers-%s-generic' % self.version, 'linux-image-%s-generic' % self.version, 'linux-image-extra-%s-generic' % self.version]:
-            if self.remove:
-                pkg_line = "%s\tpurge\n" % pkg
-            else:
-                pkg_line = "%s\tinstall\n" % pkg
-            f.write(pkg_line.encode("utf-8"))
+        cache = apt.Cache()
+        for name in KERNEL_PKG_NAMES:
+            name = name.replace("VERSION", self.version)
+            if name in cache:
+                pkg = cache[name]
+                if self.remove:
+                    if pkg.is_installed:
+                        pkg_line = "%s\tpurge\n" % name
+                        f.write(pkg_line.encode("utf-8"))
+                else:
+                    pkg_line = "%s\tinstall\n" % name
+                    f.write(pkg_line.encode("utf-8"))
+
         cmd.append("--set-selections-file")
         cmd.append("%s" % f.name)
         f.flush()