Merge ~brian-murray/ubuntu-release-upgrader:deb2snap into ubuntu-release-upgrader:ubuntu/master

[Brian Murray]

Utilize the existing code in the deb-to-snap quirk to also migrate preseeded snaps from latest/stable/ubuntu-20.10 to latest/stable/ubuntu-21.04. This'll fix bug 1922297.

[Brian Murray (brian-murray)]

The "metapkg" information is added to deb2snap.json to prevent those packages from being install on systems without the ubuntu-dekstop metapackage installed e.g. a GCE image.

[Joshua Powers (powersj)]

review: Approve

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 0127d44..6a4526e 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -122,12 +122,10 @@ class DistUpgradeQuirks(object):
         cache = self.controller.cache
         self._test_and_warn_if_ros_installed(cache)
 
-        if 'ubuntu-desktop' not in cache or \
-                'snapd' not in cache:
+        if 'snapd' not in cache:
             logging.debug("package required for Quirk not in cache")
             return
-        if cache['ubuntu-desktop'].is_installed and \
-                cache['snapd'].is_installed:
+        if cache['snapd'].is_installed:
             self._checkStoreConnectivity()
         # If the snap store is accessible, at the same time calculate the
         # extra size needed by to-be-installed snaps.  This also prepares
@@ -138,12 +136,10 @@ class DistUpgradeQuirks(object):
     def hirsutePostUpgrade(self):
         logging.debug("running Quirks.hirsutePostUpgrade")
         cache = self.controller.cache
-        if 'ubuntu-desktop' not in cache or \
-                'snapd' not in cache:
+        if 'snapd' not in cache:
             logging.debug("package required for Quirk not in cache")
             return
-        if cache['ubuntu-desktop'].is_installed and \
-                cache['snapd'].is_installed and \
+        if cache['snapd'].is_installed and \
                 self._snap_list:
             self._replaceDebsAndSnaps()
 
@@ -994,6 +990,12 @@ class DistUpgradeQuirks(object):
 
             for snap in d2s["seeded"]:
                 seed = d2s["seeded"][snap]
+                metapkg = seed.get("metapkg", None)
+                if metapkg not in self.controller.cache:
+                    continue
+                if metapkg and \
+                        self.controller.cache[metapkg].is_installed == False:
+                    continue
                 deb = seed.get("deb", None)
                 from_chan = seed.get("from_channel", from_channel)
                 to_chan = seed.get("to_channel", to_channel)
@@ -1002,11 +1004,31 @@ class DistUpgradeQuirks(object):
             for snap in d2s["unseeded"]:
                 unseed = d2s["unseeded"][snap]
                 deb = unseed.get("deb", None)
+                metapkg = unseed.get("metapkg", None)
+                if metapkg not in self.controller.cache:
+                    continue
+                if metapkg and \
+                        self.controller.cache[metapkg].is_installed == False:
+                    continue
                 from_chan = unseed.get("from_channel", from_channel)
                 unseeded_snaps[snap] = (deb, from_chan)
         except Exception as e:
             logging.warning("error reading deb2snap.json file (%s)" % e)
 
+        # list the installed snaps and add them to seeded ones
+        snap_list = subprocess.Popen(["snap", "list"],
+                                     universal_newlines=True,
+                                     stdout=subprocess.PIPE).communicate()
+        # first line of output is a header and the last line is empty
+        snaps_installed = [line.split()[0] \
+                           for line in snap_list[0].split('\n')[1:-1]]
+
+        for snap in snaps_installed:
+            if snap in seeded_snaps or snap in unseeded_snaps:
+                continue
+            else:
+                seeded_snaps[snap] = (None, from_channel, to_channel)
+
         self._view.updateStatus(_("Checking for installed snaps"))
         for snap, (deb, from_channel, to_channel) in seeded_snaps.items():
             snap_object = {}
diff --git a/DistUpgrade/deb2snap.json b/DistUpgrade/deb2snap.json
index 8681e24..3b57b98 100644
--- a/DistUpgrade/deb2snap.json
+++ b/DistUpgrade/deb2snap.json
@@ -5,24 +5,30 @@
             "to_channel": "stable"
         },
         "gnome-3-34-1804": {
+            "metapkg": "ubuntu-desktop"
         },
         "gtk-common-themes": {
+            "metapkg": "ubuntu-desktop"
         },
         "snap-store": {
-            "deb": "gnome-software"
+            "deb": "gnome-software",
+            "metapkg": "ubuntu-desktop"
         }
     },
     "unseeded": {
         "gnome-3-28-1804": {
         },
         "gnome-calculator": {
-            "deb": "gnome-calculator"
+            "deb": "gnome-calculator",
+            "metapkg": "ubuntu-desktop"
         },
         "gnome-characters": {
-            "deb": "gnome-characters"
+            "deb": "gnome-characters",
+            "metapkg": "ubuntu-desktop"
         },
         "gnome-logs": {
-            "deb": "gnome-logs"
+            "deb": "gnome-logs",
+            "metapkg": "ubuntu-desktop"
         }
     }
 }