[Merge] ~eeickmeyer/ubuntu-release-upgrader:ubuntu/noble into ubuntu-release-upgrader:ubuntu/noble

[Nick Rosbrook]

Review: Needs Fixing

This does feel like a lot, but my upgrade test worked as well.

A couple comments inline.

Diff comments:

> diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
> index 539b2b1..22a52d9 100644
> --- a/DistUpgrade/DistUpgradeQuirks.py
> +++ b/DistUpgrade/DistUpgradeQuirks.py
> @@ -2084,3 +2085,109 @@ class DistUpgradeQuirks(object):
>                  )
>              )
>              self.controller.abort()
> +
> +    def _install_pipewire_audio_on_ubuntu_studio(self):
> +        """
> +        LP: #2078639
> +        """
> +        # This is only required for upgrades from jammy.
> +        if self.controller.fromDist != 'jammy':
> +            return
> +        if self.arch != 'amd64': return

I only put this on one line in my comment for brevity. Can you please put the `return` on its own line like normal?

> +
> +        if (
> +            'ubuntustudio-desktop' in self.controller.cache and
> +            self.controller.cache['ubuntustudio-desktop'].is_installed
> +        ):
> +            logging.debug(
> +                'Detected Ubuntu Studio, installing pipewire-audio, removing pulseaudio'
> +            )
> +
> +            try:
> +                self.controller.cache['pipewire-audio'].mark_install(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pipewire-audio']
> +                )
> +                self.controller.cache['pipewire-alsa'].mark_install(

This is a lot of packages...

For starters, can you please make this a loop by iterating over a list of package names?

> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pipewire-alsa']
> +                )
> +                self.controller.cache['pipewire-pulse'].mark_install(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pipewire-pulse']
> +                )
> +                self.controller.cache['wireplumber'].mark_install(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['wireplumber']
> +                )
> +
> +                self.controller.cache['pulseaudio'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pulseaudio']
> +                )
> +                self.controller.cache['studio-controls'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['studio-controls']
> +                )
> +                self.controller.cache['pulseaudio-module-gsettings'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pulseaudio-module-gsettings']
> +                )
> +                self.controller.cache['pulseaudio-module-bluetooth'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pulseaudio-module-bluetooth']
> +                )
> +                self.controller.cache['pulseaudio-module-jack'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pulseaudio-module-jack']
> +                )
> +                self.controller.cache['pulseaudio:i386'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pulseaudio:i386']
> +                )
> +                self.controller.cache['pipewire-media-session'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['pipewire-media-session']
> +                )
> +                self.controller.cache['vokoscreen-ng'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['vokoscreen-ng']
> +                )
> +                self.controller.cache['krita-gmic'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['krita-gmic']
> +                )
> +                self.controller.cache['gnustep-back0.29'].mark_delete(
> +                    auto_fix=False
> +                )
> +                apt.ProblemResolver(self.controller.cache).protect(
> +                    self.controller.cache['gnustep-back0.29']
> +                )
> +            except KeyError as e:
> +                logging.debug(f'Failed to install pipewire-audio: {e}')


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