[Merge] lp:~sil2100/ubuntu-release-upgrader/snap-core18-from-stable into lp:ubuntu-release-upgrader

[Brian Murray]

Review: Approve

This looks good other than changing a couple of variable names to make things consistent. Thanks for taking this on!

Diff comments:

> === modified file 'DistUpgrade/DistUpgradeQuirks.py'
> --- DistUpgrade/DistUpgradeQuirks.py	2019-08-30 17:29:29 +0000
> +++ DistUpgrade/DistUpgradeQuirks.py	2019-08-30 17:29:29 +0000
> @@ -814,11 +814,17 @@
>                  self.controller.toDist).split()[0]
>          self._snap_list = {}
>          # gtk-common-themes isn't a package name but is this risky?
> -        snaps = ['core18', 'gnome-3-28-1804', 'gtk-common-themes',
> -                 'gnome-calculator', 'gnome-characters', 'gnome-logs',
> -                 'gnome-system-monitor']
> +        from_branch = "stable/ubuntu-%s" % self._from_version
> +        to_branch = "stable/ubuntu-%s" % self._to_version

Change to channels here for consistency's sake.

> +        snaps = {'core18': ('stable', 'stable'),
> +                 'gnome-3-28-1804': (from_branch, to_branch),
> +                 'gtk-common-themes': (from_branch, to_branch),
> +                 'gnome-calculator': (from_branch, to_branch),
> +                 'gnome-characters': (from_branch, to_branch),
> +                 'gnome-logs': (from_branch, to_branch),
> +                 'gnome-system-monitor': (from_branch, to_branch)}

These too of course.

>          self._view.updateStatus(_("Checking for installed snaps"))
> -        for snap in snaps:
> +        for snap, (from_channel, to_channel) in snaps.items():
>              snap_object = {}
>              # check to see if the snap is already installed
>              snap_info = subprocess.Popen(["snap", "info", snap],


-- 
https://code.launchpad.net/~sil2100/ubuntu-release-upgrader/snap-core18-from-stable/+merge/372082
Your team Ubuntu Core Development Team is subscribed to branch lp:ubuntu-release-upgrader.