Merge update-notifier:list-oem into update-notifier:master

[Iain Lane]

This goes with https://code.launchpad.net/~ubuntu-core-dev/update-manager/oem/+merge/389421

I wanted to have it out of update-manager's process, to keep update-manager always "fast" to launch - running ubuntu-drivers list-oem is pretty slow. It doesn't matter if update-notifier is slow though, since it runs in the background.

[Julian Andres Klode (juliank)]

review: Approve

Unmerged commits

25348c2... by Iain Lane on 2020-07-24

List OEM metapackages before invoking update-manager

Before invoking update-manager, run a helper script to figure out if
there are any oem-*-meta packages which apply to this system. These are
enablement packages maintained by Canonical which install any tweaks
required by a particular piece of hardware.

The script takes care to exit quickly if it's been run before or if
the system is already enabled.

It uses ubuntu-drivers' python interface, so we need to add a dependency
to make sure that is available.

There will be a companion change in update-manager to consume this list.

diff --git a/data/Makefile.am b/data/Makefile.am
index 0cd6d1a..eebbb5d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@ policydir = $(datadir)/polkit-1/actions
 policy_DATA = com.ubuntu.update-notifier.policy
 
 helperdir = $(libdir)/update-notifier
-helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
+helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader list-oem-metapackages update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
 
 notifydir = $(datadir)/update-notifier
 notify_SCRIPTS = notify-reboot-required notify-updates-outdated
diff --git a/data/list-oem-metapackages b/data/list-oem-metapackages
new file mode 100755
index 0000000..1bb6c58
--- /dev/null
+++ b/data/list-oem-metapackages
@@ -0,0 +1,48 @@
+#!/usr/bin/python3
+
+import fnmatch
+import logging
+import os
+import sys
+
+import apt
+import UbuntuDrivers.detect
+
+from gi.repository import GLib
+
+STAMP_FILE = os.path.join(GLib.get_user_runtime_dir(), "ubuntu-drivers-oem.package-list")
+
+
+def any_oem_metapackages_installed(cache):
+    installed_oem_packages = (
+        pkg
+        for pkg in cache
+        if fnmatch.fnmatch(pkg.name, "oem-*-meta") and pkg.is_installed
+    )
+
+    # Empty if there are no installed OEM packages
+    return any((True for _ in installed_oem_packages))
+
+
+def write_oem_metapackage_list(cache, filename):
+    packages = UbuntuDrivers.detect.system_device_specific_metapackages(
+        apt_cache=cache
+    )
+
+    if not packages:
+        return
+
+    with open(STAMP_FILE, "w") as f:
+        f.write("\n".join(packages))
+
+
+if __name__ == "__main__":
+    if os.path.exists(STAMP_FILE):
+        sys.exit(0)
+
+    cache = apt.Cache()
+
+    if any_oem_metapackages_installed(cache):
+        sys.exit(0)
+
+    write_oem_metapackage_list(cache, STAMP_FILE)
diff --git a/debian/control b/debian/control
index f629114..776e580 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,8 @@ Depends: ${shlibs:Depends},
          python3:any,
          python3-apt, python3-dbus, python3-debian,
          python3-debconf | debconf (<< 1.5.64~),
-         patch, update-manager-core (>= 1:17.04.2)
+         patch, ubuntu-drivers-common,
+         update-manager-core (>= 1:17.04.2)
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Suggests: policykit-1
 Description: Files shared between update-notifier and other packages
diff --git a/src/update.c b/src/update.c
index 8f20f39..588fa66 100644
--- a/src/update.c
+++ b/src/update.c
@@ -531,6 +531,26 @@ auto_launch_now (TrayApplet *ta)
    return FALSE;
 }
 
+static void
+launch_update_manager (GPid pid,
+                       gint status,
+                       gpointer user_data G_GNUC_UNUSED)
+{
+   g_autoptr(GError) error = NULL;
+
+   g_spawn_check_exit_status (status, &error);
+
+   /* list-oem-metapackages exited abnormally */
+   if (error != NULL)
+   {
+      g_printerr ("list-oem-metapackages exited abnormally: %s\n", error->message);
+      return;
+   }
+
+   g_spawn_command_line_async("nice ionice -c3 update-manager "
+                              "--no-update --no-focus-on-map", NULL);
+}
+
 gboolean
 update_check (TrayApplet *ta)
 {
@@ -640,8 +660,32 @@ update_check (TrayApplet *ta)
    tray_applet_ui_set_visible(ta, FALSE);
    if (auto_launch_now(ta))
    {
-      g_spawn_command_line_async("nice ionice -c3 update-manager "
-			         "--no-update --no-focus-on-map", NULL);
+      g_autoptr(GError) error = NULL;
+      g_autofree gchar *list_oem_metapackages = NULL;
+      GPid pid;
+      g_auto(GStrv) argv = g_new0(char *, 2);
+
+      argv[0] = g_build_filename (PACKAGE_LIB_DIR,
+                                  "update-notifier",
+                                  "list-oem-metapackages",
+                                  NULL);
+
+      g_spawn_async (NULL, /* working_directory */
+                     argv,
+                     NULL, /* envp */
+                     G_SPAWN_DO_NOT_REAP_CHILD,
+                     NULL, /* child_setup */
+                     NULL, /* user_data */
+                     &pid,
+                     &error);
+
+      if (error != NULL)
+      {
+         g_printerr("Failed to spawn ‘list-oem-metapackages’: %s\n", error->message);
+         return FALSE;
+      }
+
+      g_child_watch_add (pid, launch_update_manager, NULL);
    }
    return TRUE;