Merge lp:~robert-ancell/update-manager/ua-focal-merge into lp:~ubuntu-core-dev/update-manager/jammy

[Robert Ancell]

[Robert Ancell (robert-ancell)]

Merged because this has been uploaded as a SRU.

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2021-02-05 21:17:38 +0000
+++ UpdateManager/Core/UpdateList.py	2023-01-18 03:41:43 +0000
@@ -44,11 +44,12 @@
 
 
 class UpdateItem():
-    def __init__(self, pkg, name, icon, to_remove):
+    def __init__(self, pkg, name, icon, to_remove, sensitive=True):
         self.icon = icon
         self.name = name
         self.pkg = pkg
         self.to_remove = to_remove
+        self.sensitive = sensitive
 
     def is_selected(self):
         if not self.to_remove:
@@ -60,13 +61,13 @@
 class UpdateGroup(UpdateItem):
     _depcache = {}
 
-    def __init__(self, pkg, name, icon, to_remove):
-        UpdateItem.__init__(self, pkg, name, icon, to_remove)
+    def __init__(self, pkg, name, icon, to_remove, sensitive=True):
+        UpdateItem.__init__(self, pkg, name, icon, to_remove, sensitive)
         self._items = set()
         self._deps = set()
         self.core_item = None
         if pkg is not None:
-            self.core_item = UpdateItem(pkg, name, icon, to_remove)
+            self.core_item = UpdateItem(pkg, name, icon, to_remove, sensitive)
             self._items.add(self.core_item)
 
     @property
@@ -75,10 +76,11 @@
         all_items.extend(self._items)
         return sorted(all_items, key=lambda a: a.name.lower())
 
-    def add(self, pkg, cache=None, eventloop_callback=None, to_remove=False):
+    def add(self, pkg, cache=None, eventloop_callback=None, to_remove=False,
+            sensitive=True):
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
-        self._items.add(UpdateItem(pkg, name, icon, to_remove))
+        self._items.add(UpdateItem(pkg, name, icon, to_remove, sensitive))
         # If the pkg is in self._deps, stop here. We have already calculated
         # the recursive dependencies for this package, no need to do it again.
         if cache and pkg.name in cache and pkg.name not in self._deps:
@@ -154,27 +156,29 @@
 
 
 class UpdateApplicationGroup(UpdateGroup):
-    def __init__(self, pkg, application, to_remove):
+    def __init__(self, pkg, application, to_remove, sensitive=True):
         name = application.get_display_name()
         icon = application.get_icon()
         super(UpdateApplicationGroup, self).__init__(pkg, name, icon,
-                                                     to_remove)
+                                                     to_remove, sensitive)
 
 
 class UpdatePackageGroup(UpdateGroup):
-    def __init__(self, pkg, to_remove):
+    def __init__(self, pkg, to_remove, sensitive=True):
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
-        super(UpdatePackageGroup, self).__init__(pkg, name, icon, to_remove)
+        super(UpdatePackageGroup, self).__init__(pkg, name, icon, to_remove,
+                                                 sensitive)
 
 
 class UpdateSystemGroup(UpdateGroup):
-    def __init__(self, cache, to_remove):
+    def __init__(self, cache, to_remove, sensitive=True):
         # Translators: the %s is a distro name, like 'Ubuntu' and 'base' as in
         # the core components and packages.
         name = _("%s base") % utils.get_ubuntu_flavor_name(cache=cache)
         icon = Gio.ThemedIcon.new("distributor-logo")
-        super(UpdateSystemGroup, self).__init__(None, name, icon, to_remove)
+        super(UpdateSystemGroup, self).__init__(None, name, icon, to_remove,
+                                                sensitive)
 
 
 class UpdateOrigin():
@@ -216,6 +220,7 @@
         self.security_groups = []
         self.kernel_autoremove_groups = []
         self.duplicate_groups = []
+        self.ubuntu_pro_groups = []
         self.num_updates = 0
         self.random = random.Random()
         self.ignored_phased_updates = []
@@ -464,7 +469,8 @@
 
         return app_groups + pkg_groups
 
-    def update(self, cache, eventloop_callback=None, duplicate_packages=[]):
+    def update(self, cache, eventloop_callback=None, duplicate_packages=[],
+               ua_security_packages=[]):
         self.held_back = []
 
         # do the upgrade
@@ -476,6 +482,34 @@
         kernel_autoremove_pkgs = []
         duplicate_pkgs = []
 
+        class FakeUbuntuProPackageCandidate:
+            def __init__(self, source_name, version, size):
+                self.source_name = source_name
+                self.summary = source_name
+                self.description = source_name
+                self.version = version
+                self.size = size
+                self.downloadable = False
+                self.record = {}
+
+        class FakeUbuntuProPackage:
+            def __init__(self, package_name, version, size):
+                self.name = package_name
+                self.candidate = FakeUbuntuProPackageCandidate(package_name,
+                                                               version, size)
+                self.marked_install = False
+                self.marked_upgrade = False
+
+            def mark_install(self):
+                pass
+
+            def mark_delete(self):
+                pass
+        fake_ua_packages = []
+        for (package_name, version, size) in ua_security_packages:
+            fake_ua_packages.append(FakeUbuntuProPackage(package_name,
+                                                         version, size))
+
         # Find all upgradable packages
         for pkg in cache:
             if pkg.is_upgradable or pkg.marked_install:
@@ -541,3 +575,10 @@
             cache, kernel_autoremove_pkgs, eventloop_callback, True)
         self.duplicate_groups = self._make_groups(
             cache, duplicate_pkgs, eventloop_callback, True)
+        if len(fake_ua_packages) > 0:
+            ubuntu_pro_group = UpdateGroup(None,
+                                           "Ubuntu Pro (enable in Settings…)",
+                                           None, False, False)
+            for package in fake_ua_packages:
+                ubuntu_pro_group.add(package)
+            self.ubuntu_pro_groups = [ubuntu_pro_group]

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2021-01-05 20:24:02 +0000
+++ UpdateManager/Dialogs.py	2023-01-18 03:41:43 +0000
@@ -168,10 +168,10 @@
                self.settings_button and \
                self._has_livepatch_settings_ui() and \
                self.settings.get_int('launch-count') >= 4:
-                self.set_desc(_("<b>Tip:</b> You can use Livepatch to "
-                                "keep your computer more secure between "
-                                "restarts."))
-                self.settings_button.set_label(_("Settings & Livepatch…"))
+                self.set_desc(_("<b>Tip:</b> You can use Livepatch with "
+                                "Ubuntu Pro to keep your computer more "
+                                "secure between restarts."))
+                self.settings_button.set_label(_("Settings & Pro…"))
             return
 
         needs_reschedule = False

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2021-12-10 20:29:40 +0000
+++ UpdateManager/UpdateManager.py	2023-01-18 03:41:43 +0000
@@ -35,7 +35,12 @@
                         DeprecationWarning)
 
 import distro_info
-import fnmatch
+<<<<<<< TREE
+import fnmatch
+=======
+import fnmatch
+import json
+>>>>>>> MERGE-SOURCE
 import os
 import subprocess
 import sys
@@ -85,6 +90,7 @@
         self.unity = UnitySupport()
         self.controller = None
         self.cache = None
+        self.ua_security_packages = []
         self.update_list = None
         self.meta_release = None
         self.hwe_replacement_packages = None
@@ -247,27 +253,72 @@
                                          cancelled_update, error_occurred)
         self._start_pane(pane)
 
-    def _check_oem_metapackages(self):
-        di = distro_info.UbuntuDistroInfo()
-        codename = get_dist()
-        lts = di.is_lts(codename)
-        if not lts:
-            return None
-        OEM_PATH = os.path.join(GLib.get_user_runtime_dir(),
-                                "ubuntu-drivers-oem.package-list")
-        if not os.path.exists(OEM_PATH):
-            return None
-
-        # Packages that aren't installed but apply to this system
-        with open(OEM_PATH, 'r') as f:
-            self.oem_metapackages |= set(f.read().splitlines())
-
-        # Packages that are already installed
-        for pkg in self.cache:
-            if fnmatch.fnmatch(pkg.name, 'oem-*-meta') \
-               and pkg.installed:
-                self.oem_metapackages.add(pkg)
-
+<<<<<<< TREE
+    def _check_oem_metapackages(self):
+        di = distro_info.UbuntuDistroInfo()
+        codename = get_dist()
+        lts = di.is_lts(codename)
+        if not lts:
+            return None
+        OEM_PATH = os.path.join(GLib.get_user_runtime_dir(),
+                                "ubuntu-drivers-oem.package-list")
+        if not os.path.exists(OEM_PATH):
+            return None
+
+        # Packages that aren't installed but apply to this system
+        with open(OEM_PATH, 'r') as f:
+            self.oem_metapackages |= set(f.read().splitlines())
+
+        # Packages that are already installed
+        for pkg in self.cache:
+            if fnmatch.fnmatch(pkg.name, 'oem-*-meta') \
+               and pkg.installed:
+                self.oem_metapackages.add(pkg)
+
+=======
+    def _check_oem_metapackages(self):
+        di = distro_info.UbuntuDistroInfo()
+        codename = get_dist()
+        lts = di.is_lts(codename)
+        if not lts:
+            return None
+        OEM_PATH = os.path.join(GLib.get_user_runtime_dir(),
+                                "ubuntu-drivers-oem.package-list")
+        if not os.path.exists(OEM_PATH):
+            return None
+
+        # Packages that aren't installed but apply to this system
+        with open(OEM_PATH, 'r') as f:
+            self.oem_metapackages |= set(f.read().splitlines())
+
+        # Packages that are already installed
+        for pkg in self.cache:
+            if fnmatch.fnmatch(pkg.name, 'oem-*-meta') \
+               and pkg.installed:
+                self.oem_metapackages.add(pkg)
+
+    def _get_ua_security_status(self):
+        self.ua_security_packages = []
+        try:
+            p = subprocess.Popen(['ua', 'security-status', '--format=json'],
+                                 stdout=subprocess.PIPE)
+        except OSError:
+            pass
+        else:
+            while p.poll() is None:
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+                time.sleep(0.05)
+            s = json.load(p.stdout)
+            for package in s.get('packages', []):
+                status = package.get('status', '')
+                if status == 'pending_attach':
+                    name = package.get('name', '')
+                    version = package.get('version', '')
+                    size = package.get('download_size', 0)
+                    self.ua_security_packages.append((name, version, size))
+
+>>>>>>> MERGE-SOURCE
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
         self._check_hwe_support_status()
@@ -421,19 +472,35 @@
                 Gtk.main_iteration()
         iterate()
 
-        self._check_oem_metapackages()
-
-        for pkgname in self.oem_metapackages:
-            try:
-                if not self.cache[pkgname].is_installed:
-                    self.cache[pkgname].mark_install()
-            except SystemError:
-                pass
-
+<<<<<<< TREE
+        self._check_oem_metapackages()
+
+        for pkgname in self.oem_metapackages:
+            try:
+                if not self.cache[pkgname].is_installed:
+                    self.cache[pkgname].mark_install()
+            except SystemError:
+                pass
+
+=======
+        self._check_oem_metapackages()
+
+        self._get_ua_security_status()
+
+        for pkgname in self.oem_metapackages:
+            try:
+                if not self.cache[pkgname].is_installed:
+                    self.cache[pkgname].mark_install()
+            except SystemError:
+                pass
+
+>>>>>>> MERGE-SOURCE
         self.update_list = UpdateList(self)
         try:
             self.update_list.update(self.cache, eventloop_callback=iterate,
-                                    duplicate_packages=self.duplicate_packages)
+                                    duplicate_packages=self.duplicate_packages,
+                                    ua_security_packages=self.
+                                    ua_security_packages)
         except SystemError as e:
             header = _("Could not calculate the upgrade")
             desc = _("An unresolvable problem occurred while "

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2020-12-14 11:10:57 +0000
+++ UpdateManager/UpdatesAvailable.py	2023-01-18 03:41:43 +0000
@@ -74,7 +74,8 @@
 # - screen reader does not say "Downloaded" for downloaded updates
 
 # list constants
-(LIST_NAME, LIST_UPDATE_DATA, LIST_SIZE, LIST_TOGGLE_ACTIVE) = range(4)
+(LIST_NAME, LIST_UPDATE_DATA, LIST_SIZE, LIST_TOGGLE_ACTIVE,
+ LIST_SENSITIVE) = range(5)
 
 # NetworkManager enums
 from .Core.roam import NetworkManagerHelper
@@ -261,7 +262,7 @@
         changes_buffer.create_tag("versiontag", weight=Pango.Weight.BOLD)
 
         # the treeview (move into it's own code!)
-        self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool)
+        self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool, bool)
         self.treeview_update.set_model(None)
 
         self.image_restart.set_from_gicon(self.get_restart_icon(),
@@ -293,6 +294,8 @@
         pkg_column.pack_start(pkg_toggle_renderer, False)
         pkg_column.add_attribute(pkg_toggle_renderer,
                                  'active', LIST_TOGGLE_ACTIVE)
+        pkg_column.add_attribute(pkg_toggle_renderer,
+                                 'sensitive', LIST_SENSITIVE)
         pkg_column.set_cell_data_func(pkg_toggle_renderer,
                                       self.pkg_toggle_renderer_data_func)
 
@@ -319,6 +322,8 @@
         size_column = Gtk.TreeViewColumn(_("Download"), size_renderer,
                                          text=LIST_SIZE)
         size_column.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
+        size_column.add_attribute(size_renderer,
+                                  'sensitive', LIST_SENSITIVE)
         self.treeview_update.append_column(size_column)
 
         self.treeview_update.set_headers_visible(True)
@@ -404,8 +409,11 @@
     def restart_icon_renderer_data_func(self, cell_layout, renderer, model,
                                         iter, user_data):
         data = model.get_value(iter, LIST_UPDATE_DATA)
+        sensitive = model.get_value(iter, LIST_SENSITIVE)
         path = model.get_path(iter)
 
+        renderer.set_sensitive(sensitive)
+
         requires_restart = False
         if data.item and data.item.pkg:
             requires_restart = self.pkg_requires_restart(data.item.pkg)
@@ -433,6 +441,7 @@
         if data.item:
             activatable = data.item.pkg.name not in self.list.held_back
             inconsistent = False
+            renderer.set_sensitive(data.item.sensitive)
         elif data.group:
             activatable = True
             inconsistent = data.group.selection_is_inconsistent()
@@ -485,8 +494,11 @@
     def pkg_label_renderer_data_func(self, cell_layout, renderer, model,
                                      iter, user_data):
         data = model.get_value(iter, LIST_UPDATE_DATA)
+        sensitive = model.get_value(iter, LIST_SENSITIVE)
         name = GLib.markup_escape_text(model.get_value(iter, LIST_NAME))
 
+        renderer.set_sensitive(sensitive)
+
         if data.group:
             markup = name
         elif data.item:
@@ -1000,6 +1012,7 @@
             name,
             UpdateData(groups, None, None),
             humanize_size(total_size),
+            True,
             True
         ]
         return self.store.append(None, header_row)
@@ -1023,7 +1036,8 @@
                 group.name,
                 UpdateData(None, group, group_is_item),
                 humanize_size(group.get_total_size()),
-                True
+                True,
+                group.sensitive
             ]
             group_iter = self.store.append(None, group_row)
 
@@ -1034,7 +1048,8 @@
                     item.name,
                     UpdateData(None, None, item),
                     humanize_size(getattr(item.pkg.candidate, "size", 0)),
-                    True
+                    True,
+                    group.sensitive
                 ]
                 self.store.append(group_iter, item_row)
 
@@ -1077,6 +1092,8 @@
                 _("Duplicate packages to be removed"),
                 self.list.duplicate_groups)
             self._add_groups(self.list.duplicate_groups)
+        if self.list.ubuntu_pro_groups:
+            self._add_groups(self.list.ubuntu_pro_groups)
 
         self.treeview_update.set_model(self.store)
         self.pkg_cell_area.indent_toplevel = (

=== modified file 'UpdateManager/backend/__init__.py'
=== modified file 'debian/changelog'
--- debian/changelog	2022-12-01 19:09:52 +0000
+++ debian/changelog	2023-01-18 03:41:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 update-manager (1:22.04.10) jammy; urgency=medium
 
   [ Renan Rodrigo ]
@@ -218,6 +219,114 @@
 
  -- Brian Murray <[e-mail]>  Wed, 27 May 2020 13:29:24 -0700
 
+=======
+update-manager (1:20.04.10.12) focal; urgency=medium
+
+  * Show pending Ubuntu pro packages (LP: #1990450)
+
+ -- Robert Ancell <[e-mail]>  Wed, 18 Jan 2023 15:03:27 +1300
+
+update-manager (1:20.04.10.11) focal; urgency=medium
+
+  [ Renan Rodrigo ]
+  * ubuntu-security-status: Don't show ESM Apps information when the service
+    is disabled, and prefer 'pro security-status' when it is available.
+    (LP: #1991533)
+
+ -- Brian Murray <[e-mail]>  Thu, 01 Dec 2022 11:10:57 -0800
+
+update-manager (1:20.04.10.10) focal; urgency=medium
+
+  * ubuntu-security-status: Check if ESM for Apps is enabled or if it is not
+    in beta before displaying information about the packages available from
+    there. Additionally, improve pluralization in a couple of locations.
+    (LP: #1955471)
+
+ -- Brian Murray <[e-mail]>  Fri, 14 Jan 2022 10:28:42 -0800
+
+update-manager (1:20.04.10.9) focal; urgency=medium
+
+  * ubuntu-security-status: use ubuntu-advantage-tools to determine whether or
+    not livepatch or esm are enabled and if the system is attached. Thanks to
+    Chad Smith for the patch. (LP: #1938043)
+
+ -- Brian Murray <[e-mail]>  Fri, 03 Sep 2021 15:17:22 -0700
+
+update-manager (1:20.04.10.8) focal; urgency=medium
+
+  * tests/test_meta_release_core.py: switch a test from using lucid to bionic
+    as precise was removed from the archive. (LP: #1929865)
+
+ -- Brian Murray <[e-mail]>  Thu, 27 May 2021 13:36:54 -0700
+
+update-manager (1:20.04.10.7) focal; urgency=medium
+
+  * tests/test_update_list.py: rewrite how APT::VersionedKernelPackages is set.
+    (LP: #1924809)
+  * debian/tests/control: add apt to the list of Depends.
+
+ -- Brian Murray <[e-mail]>  Fri, 16 Apr 2021 16:25:21 -0700
+
+update-manager (1:20.04.10.6) focal; urgency=medium
+
+  * UpdateManager/Core/UpdateList.py: change to a regex from a static list
+    of packages to be grouped under Ubuntu Base (LP: #1902025)
+  * Clean up apt cache binary files left behind by tests
+  * Rename meta_pkgs to ubuntu_base_pkgs to make it more clear to the
+    reader which packages should be included
+  * Add tests in to ensure Ubuntu base packages are not grouped when
+    staged for removal (LP: #1912718)
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Wed, 10 Feb 2021 14:39:27 -0600
+
+update-manager (1:20.04.10.5) focal; urgency=medium
+
+  * UpdateManager/backend/__init__.py: Really make commit_oem a no-op in the
+    base class to avoid crash when people force synaptic backend (LP: #1913732)
+  * Fix typo in previous changelog
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jan 2021 17:43:01 +0100
+
+update-manager (1:20.04.10.4) focal; urgency=medium
+
+  * Revert previous change to UpdateList.py, as it breaks kernel
+    autoremoval (LP: #1912718)
+  * UpdateManager/backend/__init__.py: Make commit_oem a no-op in the base
+    class to avoid crash when people force synaptic backend (LP: #1913732)
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jan 2021 12:50:23 +0100
+
+update-manager (1:20.04.10.3) focal; urgency=medium
+
+  [ Julian Andres Klode ]
+  * UpdateManager/backend/__init__.py: Fix unbound local variables regression
+    introduced by the previous SRU (See LP 1910556), and correct comment
+
+  [ William Wilson ]
+  * UpdateManager/Core/UpdateList.py: change to a regex from a static list
+    of packages to be grouped under Ubuntu Base (LP: #1902025)
+
+ -- Brian Murray <[e-mail]>  Wed, 13 Jan 2021 08:35:58 -0800
+
+update-manager (1:20.04.10.2) focal; urgency=medium
+
+  [ Iain Lane & Julian Andres Klode ]
+  * Support post install enablement of OEM-enabled devices (LP: #1908050)
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 14 Dec 2020 12:24:18 +0100
+
+update-manager (1:20.04.10.1) focal; urgency=medium
+
+  * UpdateManager/UpdateManager.py: when refreshing the cache and encountering
+    an error return rather than trying to use the undefined cache which causes
+    crashes. Additionally, don't present the dialog with a "Try Again" button
+    which won't do anything. (LP: #1826213)
+  * Fix hang in apturl-gtk. (LP: #1874591)
+  * Fix crash in snap updates when refreshing the cache fails. (LP: #1880987)
+
+ -- Brian Murray <[e-mail]>  Wed, 03 Jun 2020 10:18:00 -0700
+
+>>>>>>> MERGE-SOURCE
 update-manager (1:20.04.10) focal; urgency=medium
 
   * Fix intermittent hang during snap updates (LP: #1874469).

=== modified file 'debian/control'
=== modified file 'tests/test_meta_release_core.py'
--- tests/test_meta_release_core.py	2022-01-26 23:05:32 +0000
+++ tests/test_meta_release_core.py	2023-01-18 03:41:43 +0000
@@ -9,8 +9,12 @@
 import random
 import sys
 import tempfile
+<<<<<<< TREE
 import time
 import unittest
+=======
+import glob
+>>>>>>> MERGE-SOURCE
 try:
     from test.support import EnvironmentVarGuard
 except ImportError:
@@ -181,7 +185,11 @@
         ltses = [supported for supported in di.supported()
                  if di.is_lts(supported)]
         with EnvironmentVarGuard() as environ:
+<<<<<<< TREE
             environ["META_RELEASE_FAKE_CODENAME"] = ltses[-2]
+=======
+            environ["META_RELEASE_FAKE_CODENAME"] = "bionic"
+>>>>>>> MERGE-SOURCE
             meta = MetaReleaseCore(forceDownload=True)
             while meta.downloading:
                 time.sleep(0.1)