[Merge] ~juliank/ubuntu-release-upgrader:plucky/block-zfs into ubuntu-release-upgrader:ubuntu/plucky

[Nick Rosbrook]

Review: Approve

Small inline comment. Otherwise LGTM.

Diff comments:

> diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
> index 466a34c..b16eda3 100644
> --- a/DistUpgrade/DistUpgradeQuirks.py
> +++ b/DistUpgrade/DistUpgradeQuirks.py
> @@ -1148,3 +1149,29 @@ class DistUpgradeQuirks(object):
>              self.controller.cache['linux-sysctl-defaults'].mark_install(
>                  auto_fix=False
>              )
> +
> +    def _test_and_fail_on_zfs(self):
> +        # If there are no pools (-H is scripted mode),
> +        # or no zpool tool, we are good
> +        try:
> +            if not subprocess.check_output(["zpool", "list", "-H"]):

Doesn't this throw subprocess.CalledProcessError on non-zero exit codes?

> +                return
> +        except FileNotFoundError:
> +            return
> +
> +        logging.debug('Detected ZFS')
> +
> +        self._view.error(
> +            _(
> +                'Sorry, cannot upgrade this system to 25.04 right now'
> +            ),
> +            _(
> +                'System freezes have been observed on upgrades to 25.04 with '
> +                'ZFS enabled.\n'
> +                'Please see '
> +                'https://wiki.ubuntu.com/PluckyPuffin/ReleaseNotes '
> +                'for more information.'
> +
> +            ),
> +        )
> +        self.controller.abort()


-- 
https://code.launchpad.net/~juliank/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/486700
Your team Ubuntu Core Development Team is subscribed to branch ubuntu-release-upgrader:ubuntu/plucky.