Merge ~enr0n/ubuntu-release-upgrader:ubuntu/noble into ubuntu-release-upgrader:ubuntu/noble

[Nick Rosbrook]

[Julian Andres Klode (juliank)]

lgtm

review: Approve

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index eebe281..674a4b8 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -31,6 +31,7 @@ import locale
 import logging
 import shutil
 import glob
+import tempfile
 import time
 import copy
 from configparser import NoOptionError
@@ -1807,18 +1808,20 @@ class DistUpgradeController(object):
         # here in the simulation as we'd write the simulated end result to the file, so let's
         # not write the file for the simulation.
         backups["Dir::State::extended_states"] = [apt_pkg.config["Dir::State::extended_states"]]
-        apt_pkg.config["Dir::State::extended_states"] = "/dev/null"
 
-        for lst in "dpkg::pre-invoke", "dpkg::pre-install-pkgs", "dpkg::post-invoke", "dpkg::post-install-pkgs":
-            backups[lst + "::"] = apt_pkg.config.value_list(lst)
-            apt_pkg.config.clear(lst)
+        with tempfile.NamedTemporaryFile(prefix='apt_extended_states_') as f:
+            apt_pkg.config["Dir::State::extended_states"] = f.name
 
-        try:
-            return self.doDistUpgrade()
-        finally:
-            for lst in backups:
-                for item in backups[lst]:
-                    apt_pkg.config.set(lst, item)
+            for lst in "dpkg::pre-invoke", "dpkg::pre-install-pkgs", "dpkg::post-invoke", "dpkg::post-install-pkgs":
+                backups[lst + "::"] = apt_pkg.config.value_list(lst)
+                apt_pkg.config.clear(lst)
+
+            try:
+                return self.doDistUpgrade()
+            finally:
+                for lst in backups:
+                    for item in backups[lst]:
+                        apt_pkg.config.set(lst, item)
 
     def doDistUpgrade(self):
         # add debug code only here
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 0ca7285..a549d8c 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -123,7 +123,6 @@ class DistUpgradeQuirks(object):
         self._test_and_fail_on_i386()
         self._test_and_fail_on_aufs()
         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()
 
@@ -1680,50 +1679,6 @@ class DistUpgradeQuirks(object):
             logging.debug(f'Failed to enable {os.path.basename(unit_file)}. '
                           'Font will not be restored on reboot')
 
-    def _test_and_fail_on_bios_with_xfs_boot(self):
-        """
-        If this system is BIOS and has XFS on /boot, do not allow the upgrade
-        to happen (LP: #2039172).
-        """
-        if os.path.isdir('/sys/firmware/efi'):
-            # UEFI boot, nothing to do.
-            return
-
-        boot_fs = None
-        root_fs = None
-        with open('/proc/mounts') as f:
-            for line in f.readlines():
-                try:
-                    (what, where, fs, opts, a, b) = line.strip().split()
-                    where = where.lower()
-                    fs = fs.lower()
-                except ValueError:
-                    logging.debug(
-                        f'line \'{line}\' in /proc/mounts not understood'
-                    )
-                    continue
-
-                if where == '/':
-                    root_fs = fs
-                elif where == '/boot':
-                    boot_fs = fs
-
-                if boot_fs and root_fs:
-                    break
-
-        if boot_fs == 'xfs' or (boot_fs is None and root_fs == 'xfs'):
-            # If we got to this point, then this is a BIOS system, and /boot is
-            # XFS or / is XFS and there is no separate /boot partition. Do not
-            # allow the upgrade to happen.
-            logging.error('Cannot upgrade system with BIOS and XFS /boot')
-            self._view.error(
-                _("Cannot upgrade this system"),
-                _("Due to a bug in grub, this system cannot "
-                  "be safely upgraded at this time.\n\n"
-                  "See https://launchpad.net/bugs/2039172.")
-            )
-            self.controller.abort()
-
     def _maybe_remove_gpg_wks_server(self):
         """
         Prevent postfix from being unnecessarily installed, and leading to a
@@ -1842,6 +1797,9 @@ class DistUpgradeQuirks(object):
                     ver.parent_pkg
                 )
 
+                if replacement.candidate is None:
+                    continue
+
                 if replacement.candidate._cand != ver:
                     continue
 
diff --git a/tests/test_quirks.py b/tests/test_quirks.py
index a3fabec..10d95f9 100644
--- a/tests/test_quirks.py
+++ b/tests/test_quirks.py
@@ -1053,55 +1053,6 @@ MMU             : Hash
 
         mock_file.assert_called_with("/proc/cpuinfo")
 
-    @mock.patch('os.path.isdir')
-    def test_bios_with_xfs_boot_fail(self, mock_is_dir):
-        proc_mounts = """\
-sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-{boot}
-/dev/mapper/vgubuntu-root / {fs} rw,relatime,errors=remount-ro 0 0
-securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0
-tmpfs /dev/shm tmpfs rw,nosuid,nodev,inode64 0 0
-tmpfs /run/lock tmpfs rw,nosuid,nodev,noexec,relatime,size=5120k,inode64 0 0
-cgroup2 /sys/fs/cgroup cgroup2 rw,nosuid,nodev,noexec,relatime 0 0
-"""
-        boot_line = '/dev/nvme0n1p2 /boot {fs} rw,relatime 0 0'
-
-        test_table = [
-            # / fs, /boot fs, expected abort calls if BIOS
-            ('xfs', None, 1),
-            ('ext4', None, 0),
-            ('xfs', 'xfs', 1),
-            ('ext4', 'xfs', 1),
-            ('xfs', 'ext4', 0),
-            ('ext4', 'ext4', 0),
-        ]
-
-        for (root_fs, boot_fs, num_abort_calls) in test_table:
-            boot = boot_line.format(fs=boot_fs) if boot_fs else ''
-            m = mock.mock_open(
-                read_data=proc_mounts.format(fs=root_fs, boot=boot)
-            )
-            with mock.patch('builtins.open', m) as mock_file:
-                controller = mock.Mock()
-                config = mock.Mock()
-                q = DistUpgradeQuirks(controller, config)
-
-                # UEFI
-                mock_is_dir.return_value = True  # /sys/firmware/efi
-                q._test_and_fail_on_bios_with_xfs_boot()
-                self.assertEqual(len(controller.abort.mock_calls), 0)
-
-                # BIOS
-                mock_is_dir.return_value = False  # /sys/firmware/efi
-                q._test_and_fail_on_bios_with_xfs_boot()
-                self.assertEqual(
-                    len(controller.abort.mock_calls),
-                    num_abort_calls,
-                    f'root_fs = {root_fs}, boot_fs = {boot_fs}',
-                )
-                mock_file.assert_called_with('/proc/mounts')
-
     def test_raspi_armhf_abort_upgrade(self):
         for arch in ('armhf', 'arm64'):
             with mock.patch(