Merge ~nteodosio/update-manager:focal-json-to-api into update-manager:ubuntu/focal

[Nathan Teodosio]

Ditch ua security-status, use Pro API.

Re-spin of https://code.launchpad.net/~nteodosio/update-manager/+git/update-manager/+merge/459153, which was actually only partially merged at the time due to SRU rejection.

[Sebastien Bacher (seb128)]

Thanks! I'm fixing the typo in the changelog and merging

review: Approve

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 7c6fa3d..f677cb9 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -27,6 +27,7 @@ from gi.repository import Gdk, GdkX11
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import GObject
+import uaclient.api.u.pro.packages.updates.v1 as ua
 
 GdkX11  # pyflakes
 
@@ -36,11 +37,11 @@ warnings.filterwarnings("ignore", "Accessed deprecated property",
 
 import distro_info
 import fnmatch
-import json
 import os
 import subprocess
 import sys
 import time
+import threading
 from gettext import gettext as _
 
 import dbus
@@ -269,36 +270,37 @@ class UpdateManager(Gtk.Window):
                and pkg.installed:
                 self.oem_metapackages.add(pkg)
 
+    def _fetch_ua_updates(self):
+        self.ua_updates = ua.updates().updates
+
     def _get_ua_security_status(self):
         self.ua_security_packages = []
-        try:
-            p = subprocess.Popen(['pro', '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', []):
-                if package.get('service_name', '') == 'standard-security':
-                    continue
-                status = package.get('status', '')
-                if (
-                    status == 'pending_attach'
-                    or status == 'pending_enable'
-                    or status == 'upgrade_available'
-                ):
-                    name = package.get('package', '')
-                    version = package.get('version', '')
-                    size = package.get('download_size', 0)
-                    downloadable = status == 'upgrade_available'
-                    self.ua_security_packages.append(
-                        (name, version, size, downloadable)
-                    )
-            self.cache.create_pro_cache(self.ua_security_packages)
+        t = threading.Thread(target=self._fetch_ua_updates, daemon=True)
+        t.start()
+        while t.is_alive():
+            while Gtk.events_pending():
+                Gtk.main_iteration()
+            time.sleep(0.05)
+        for package in self.ua_updates:
+            if (
+                package.provided_by == 'standard-security'
+                or package.provided_by == 'standard-updates'
+            ):
+                continue
+            status = package.status
+            if (
+                status == 'pending_attach'
+                or status == 'pending_enable'
+                or status == 'upgrade_available'
+            ):
+                name = package.package
+                version = package.version
+                size = package.download_size
+                downloadable = status == 'upgrade_available'
+                self.ua_security_packages.append(
+                    (name, version, size, downloadable)
+                )
+        self.cache.create_pro_cache(self.ua_security_packages)
 
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
diff --git a/debian/changelog b/debian/changelog
index 70d8dde..6777871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+update-manager (1:20.04.11) focal; urgency=medium
+
+  * Replace Popen to 'ua security-status --format=json' by the Ubuntu Pro API.
+    The former is not stable enough would break the porgram once in a while
+    when something unrelated to Update Manager (Livepatch, for instance) went
+    awry. The updates() end point from the API, on the other hand, does not
+    raise exceptions. LP: #2058133.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Fri, 22 Mar 2024 08:38:43 +0100
+
 update-manager (1:20.04.10.20) focal; urgency=medium
 
   * d/control: Depend on ubuntu-advantage-tools >= 30~.