Merge lp:~robert-ancell/update-manager/ua into lp:update-manager

[Robert Ancell]

[Julian Andres Klode (juliank)]

It's an interesting proof of concept, but I'd really like to see this done properly by investigating the cache to find out the Pro packages and then using the real Version objects vs. a query in a subprocess, see update-notifier's apt_check.py for example.

Then we also get the description and everything working correctly.

review: Needs Fixing

[Julian Andres Klode (juliank)]

Though tbh, we probably should ship a python library in ubuntu-advantage-tools and use that in update-notifier and update-manager rather than implement the logic in a third place, but consolidation is not a blocker.

[lp:~robert-ancell/update-manager/ua]

2959. By Robert Ancell on 2022-09-27

Remove unused code

2960. By Robert Ancell on 2022-09-27

Use json.load instead of json.loads

[Robert Ancell (robert-ancell)]

I've fixed the small issues you pointed out.

As you discussed with Seb, we wont be able to access the cache directly in the timeframe required so this will have to be the current solution, right?

[Julian Andres Klode (juliank)]

review: Approve

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2021-02-05 21:17:38 +0000
+++ UpdateManager/Core/UpdateList.py	2022-09-27 23:18:51 +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,10 @@
         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 +155,27 @@
 
 
 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 +217,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 +466,7 @@
 
         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 +478,31 @@
         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 +568,8 @@
             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/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2021-12-10 20:29:40 +0000
+++ UpdateManager/UpdateManager.py	2022-09-27 23:18:51 +0000
@@ -36,6 +36,7 @@
 
 import distro_info
 import fnmatch
+import json
 import os
 import subprocess
 import sys
@@ -85,6 +86,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
@@ -268,6 +270,27 @@
                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)
+            ua_attached = s.get('summary', {}).get('ua', {}).get('attached', False)
+            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))
+
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
         self._check_hwe_support_status()
@@ -423,6 +446,8 @@
 
         self._check_oem_metapackages()
 
+        self._get_ua_security_status()
+
         for pkgname in self.oem_metapackages:
             try:
                 if not self.cache[pkgname].is_installed:
@@ -433,7 +458,7 @@
         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	2022-09-27 23:18:51 +0000
@@ -74,7 +74,7 @@
 # - 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 +261,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 +293,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 +321,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 +408,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 +440,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 +493,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 +1011,7 @@
             name,
             UpdateData(groups, None, None),
             humanize_size(total_size),
+            True,
             True
         ]
         return self.store.append(None, header_row)
@@ -1023,7 +1035,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 +1047,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 +1091,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 'debian/changelog'
--- debian/changelog	2022-08-26 01:52:12 +0000
+++ debian/changelog	2022-09-27 23:18:51 +0000
@@ -1,3 +1,9 @@
+update-manager (1:22.10.1+ubuntupro1) kinetic; urgency=medium
+
+  * Show pending Ubuntu pro packages
+
+ -- Robert Ancell <[e-mail]>  Fri, 01 Jul 2022 16:15:05 +1200
+
 update-manager (1:22.10.1) kinetic; urgency=medium
 
   * Build with snapd-glib 1.61