Merge lp:~jawn-smith/update-manager/hwe-kernel-scope into lp:update-manager

[William Wilson]

Added the hwe kernel packages to the get_linux_packages function that groups them under Ubuntu Base

[lp:~jawn-smith/update-manager/hwe-kernel-scope]

2903. By William Wilson on 2021-01-07

Moving to using the kernel regex check in 01autoremove rather than a static list for packages that need to appear under Ubuntu Base

[Brian Murray (brian-murray)]

This looks good, thanks for working on this. I think it'd be best to test a couple more regular expressions that appear in 01autoremove though as it may actually group more packages under "Ubunt u Base" than we want.

review: Needs Information

[lp:~jawn-smith/update-manager/hwe-kernel-scope]

2904. By William Wilson on 2021-01-07

refining regex used to determine Ubuntu Base packages

2905. By William Wilson on 2021-01-07

Adding new test to ensure certain packages are not grouped under Ubuntu Base. Also small regex update

[Brian Murray (brian-murray)]

This looks really good, I've just made a couple of minor comments which appear in-line.

review: Needs Fixing

[lp:~jawn-smith/update-manager/hwe-kernel-scope]

2906. By William Wilson on 2021-01-08

LP: #1902025 clarifying meta vs linux packages, fixing changelog, using tuple instead of list for immutability

[William Wilson (jawn-smith)]

> This looks really good, I've just made a couple of minor comments which appear
> in-line.

Comments addressed and linked the LP bug.

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2020-08-17 15:12:42 +0000
+++ UpdateManager/Core/UpdateList.py	2021-01-08 15:34:15 +0000
@@ -36,6 +36,7 @@
 import os
 import random
 import glob
+import re
 
 from gi.repository import Gio
 
@@ -384,43 +385,6 @@
                 return True
         return False
 
-    def _get_linux_packages(self):
-        "Return all binary packages made by the linux-meta source package"
-        # Hard code this rather than generate from source info in cache because
-        # that might only be available if we have deb-src lines.  I think we
-        # could also generate it by iterating over all the binary package info
-        # we have, but that is costly.  These don't change often.
-        return ['linux',
-                'linux-cloud-tools-generic',
-                'linux-cloud-tools-lowlatency',
-                'linux-cloud-tools-virtual',
-                'linux-crashdump',
-                'linux-generic',
-                'linux-generic-lpae',
-                'linux-headers-generic',
-                'linux-headers-generic-lpae',
-                'linux-headers-lowlatency',
-                'linux-headers-lowlatency-lpae',
-                'linux-headers-server',
-                'linux-headers-virtual',
-                'linux-image',
-                'linux-image-extra-virtual',
-                'linux-image-generic',
-                'linux-image-generic-lpae',
-                'linux-image-lowlatency',
-                'linux-image-virtual',
-                'linux-lowlatency',
-                'linux-signed-generic',
-                'linux-signed-image-generic',
-                'linux-signed-image-lowlatency',
-                'linux-signed-lowlatency',
-                'linux-source',
-                'linux-tools-generic',
-                'linux-tools-generic-lpae',
-                'linux-tools-lowlatency',
-                'linux-tools-virtual',
-                'linux-virtual']
-
     def _make_groups(self, cache, pkgs, eventloop_callback, to_remove=False):
         if not pkgs:
             return []
@@ -452,10 +416,30 @@
         if ungrouped_pkgs:
             # Separate out system base packages. If we have already found an
             # application for all updates, don't bother.
+            linux_names = ("linux$",
+                           "linux-.*-buildinfo.*",
+                           "linux-.*-dev.*",
+                           "linux-.*-generic.*",
+                           "linux-.*-headers.*",
+                           "linux-.*-hwe.*",
+                           "linux-.*-gcp.*",
+                           "linux-.*-kernel.*",
+                           "linux-.*-lowlatency.*",
+                           "linux-.*-modules.*",
+                           "linux-.*-raspi.*",
+                           "linux-.*-tools.*",
+                           "linux-.*-virtual.*",
+                           "linux-base.*",
+                           "linux-crashdump.*",
+                           "linux-doc.*")
+            linux_regexp = re.compile("(" + "|".join(
+                ["^" + n for n in linux_names]) + ")")
             meta_group = UpdateGroup(None, None, None, to_remove)
             flavor_package = utils.get_ubuntu_flavor_package(cache=cache)
             meta_pkgs = [flavor_package, "ubuntu-standard", "ubuntu-minimal"]
-            meta_pkgs.extend(self._get_linux_packages())
+            for pkg in cache:
+                if linux_regexp.match(pkg.name):
+                    meta_pkgs.append(pkg)
             for pkg in meta_pkgs:
                 if pkg in cache:
                     meta_group.add(cache[pkg])

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2020-11-30 14:06:28 +0000
+++ UpdateManager/Dialogs.py	2021-01-08 15:34:15 +0000
@@ -155,8 +155,9 @@
 
     def _has_livepatch_settings_ui(self):
         try:
-            return Gio.DesktopAppInfo.new('gnome-online-accounts-panel.desktop')
-        except:
+            return Gio.DesktopAppInfo \
+                .new('gnome-online-accounts-panel.desktop')
+        except Exception:
             return None
 
     def on_livepatch_status_ready(self, active, cs, ps, fixes):

=== modified file 'debian/changelog'
--- debian/changelog	2021-01-07 00:27:44 +0000
+++ debian/changelog	2021-01-08 15:34:15 +0000
@@ -1,12 +1,17 @@
 update-manager (1:21.04.2) UNRELEASED; urgency=medium
 
+  [ Brian Murray ]
   * UpdateManager/Dialogs.py: do not mention livepatch settings when the
     interface is not installed, thanks to Sebastien Bacher for the patch.
     (LP: #1807900)
   * UpdateManager/backend/__init__.py: Resolve unbound local error crash with
     oem package lists. Thanks to Thomas Bechtold for the patch.
 
- -- Brian Murray <[e-mail]>  Wed, 16 Dec 2020 14:12:32 -0800
+  [ William Wilson ]
+  * UpdateManager/Core/UpdateList.py: change to a regex from a static list
+    of files to be grouped under Ubuntu Base (LP: #1902025)
+
+ -- Brian Murray <[e-mail]>  Thu, 07 Jan 2021 16:07:15 -0600
 
 update-manager (1:21.04.2) hirsute; urgency=medium
 

=== modified file 'tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages'
--- tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages	2013-01-21 01:49:22 +0000
+++ tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages	2021-01-08 15:34:15 +0000
@@ -78,3 +78,27 @@
 Recommends: base-pkg
 Description: meta package
 Origin: Ubuntu
+
+Package: linux-test-hwe
+Priority: optional
+Section: admin
+Installed-Size: 1
+Maintainer: Foo <[e-mail]>
+Architecture: all
+Version: 1
+Size: 1
+Recommends: base-pkg
+Description: positive test for linux package names
+Origin: Ubuntu
+
+Package: linux-show-player
+Priority: optional
+Section: admin
+Installed-Size: 1
+Maintainer: Foo <[e-mail]>
+Architecture: all
+Version: 1
+Size: 1
+Recommends: base-pkg
+Description: negative test for linux package names
+Origin: Ubuntu

=== modified file 'tests/aptroot-grouping-test/var/lib/dpkg/status'
--- tests/aptroot-grouping-test/var/lib/dpkg/status	2013-01-21 01:49:22 +0000
+++ tests/aptroot-grouping-test/var/lib/dpkg/status	2021-01-08 15:34:15 +0000
@@ -80,3 +80,33 @@
 Architecture: all
 Version: 0.1
 Description: an installed package that only one app depends on
+
+Package: ubuntu-minimal
+Status: install ok installed
+Priority: optional
+Section: admin
+Installed-Size: 1
+Maintainer: Ubuntu Developers <[e-mail]>
+Architecture: all
+Version: 0.1
+Description: meta package
+
+Package: linux-test-hwe
+Status: install ok installed
+Priority: optional
+Section: admin
+Installed-Size: 1
+Maintainer: Ubuntu Developers <[e-mail]>
+Architecture: all
+Version: 0.1
+Description: positive test for linux package names
+
+Package: linux-show-player
+Status: install ok installed
+Priority: optional
+Section: admin
+Installed-Size: 1
+Maintainer: Ubuntu Developers <[e-mail]>
+Architecture: all
+Version: 0.1
+Description: negative test for linux package names

=== modified file 'tests/test_update_list.py'
--- tests/test_update_list.py	2017-08-07 19:42:06 +0000
+++ tests/test_update_list.py	2021-01-08 15:34:15 +0000
@@ -166,9 +166,18 @@
         self.assertListEqual([x.pkg.name for x in group.items],
                              ['installed-pkg'])
 
+    def test_negative_regex_match(self):
+        self.assertGreater(len(self.updates_list.update_groups), 3)
+        group = self.updates_list.update_groups[3]
+        self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
+        self.assertIsNotNone(group.core_item)
+        self.assertEqual(group.core_item.pkg.name, 'linux-show-player')
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-show-player'])
+
     def test_pkg_multiple_deps(self):
-        self.assertEqual(len(self.updates_list.update_groups), 4)
-        group = self.updates_list.update_groups[3]
+        self.assertGreater(len(self.updates_list.update_groups), 4)
+        group = self.updates_list.update_groups[4]
         self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
         self.assertIsNotNone(group.core_item)
         self.assertEqual(group.core_item.pkg.name,
@@ -183,6 +192,15 @@
         self.assertIsNone(group.core_item)
         self.assertListEqual([x.pkg.name for x in group.items], ['base-pkg'])
 
+    def test_base_grouping(self):
+        self.assertEqual(len(self.updates_list.update_groups), 6)
+        group = self.updates_list.update_groups[5]
+        self.assertIsInstance(group, UpdateList.UpdateSystemGroup)
+        self.assertIsNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['ubuntu-minimal',
+                              'linux-test-hwe'])
+
 
 if __name__ == "__main__":
     unittest.main()