Merge ~enr0n/ubuntu-release-upgrader:lp-2065229 into ubuntu-release-upgrader:ubuntu/main

[Nick Rosbrook]

[Steve Langasek (vorlon)]

review: Approve

Unmerged commits

9446b79... by Nick Rosbrook on 2024-05-08

DistUpgradeQuirks: prevent upgrades of TPM FDE desktops

If a system has pc-kernel snap and ubuntu-desktop-minimal metpackage
installed, then it looks like a TPM FDE desktop. Use this as a condition
to prevent upgrades.

LP: #2065229

8941da8... by Nick Rosbrook on 2024-05-08

tests: fix un-templated expected ubuntu.sources

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index a50ce8a..4e82868 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -125,6 +125,7 @@ class DistUpgradeQuirks(object):
         self._test_and_fail_on_power8()
         self._test_and_fail_on_bios_with_xfs_boot()
         self._test_and_fail_on_armhf_raspi()
+        self._test_and_fail_on_tpm_fde()
 
         cache = self.controller.cache
         self._test_and_warn_if_ros_installed(cache)
@@ -1835,3 +1836,38 @@ class DistUpgradeQuirks(object):
         if remove_ufw:
             ufw.mark_delete(auto_fix=False)
             apt.ProblemResolver(self.controller.cache).protect(ufw)
+
+    def _test_and_fail_on_tpm_fde(self):
+        """
+        LP: #2065229
+        """
+        try:
+            snap_list = subprocess.check_output(['snap', 'list'])
+            snaps = [s.decode().split()[0] for s in snap_list.splitlines() ]
+        except FileNotFoundError:
+            # snapd not installed?
+            return
+
+        if (
+            'pc-kernel' in snaps and
+            'ubuntu-desktop-minimal' in self.controller.cache and
+            self.controller.cache['ubuntu-desktop-minimal'].is_installed
+        ):
+            logging.debug('Detected TPM FDE system')
+
+            di = distro_info.UbuntuDistroInfo()
+            version = di.version(self.controller.toDist) or 'next release'
+
+            self._view.error(
+                _(
+                    f'Sorry, cannot upgrade this system to {version}'
+                ),
+                _(
+                    'Upgrades for desktop systems running TPM FDE are not '
+                    'currently supported. '
+                    'Please see https://launchpad.net/bugs/2065229 '
+                    'for more information.'
+
+                ),
+            )
+            self.controller.abort()
diff --git a/tests/data-deb822-migration-test/test_ports_sources_list_migration/expect/ubuntu.sources b/tests/data-deb822-migration-test/test_ports_sources_list_migration/expect/ubuntu.sources
index e16fa2d..8bfd1f8 100644
--- a/tests/data-deb822-migration-test/test_ports_sources_list_migration/expect/ubuntu.sources
+++ b/tests/data-deb822-migration-test/test_ports_sources_list_migration/expect/ubuntu.sources
@@ -1,5 +1,5 @@
 Types: deb
 URIs: http://ports.ubuntu.com/ubuntu-ports
-Suites: mantic mantic-updates mantic-security mantic-backports
+Suites: {dist} {dist}-updates {dist}-security {dist}-backports
 Components: main restricted universe multiverse
 Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg