Merge lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap into lp:ubuntu-release-upgrader

[Brian Murray]

[lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap]

3142. By Brian Murray on 2018-07-03

fix merge conflict

3143. By Brian Murray on 2018-07-03

really fix merge conflict

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap]

3144. By Brian Murray on 2018-07-04

DistUpgradeQuirks.py: adjust language based on reviewer feedback, raise a dialog instead of aborting the upgrade

[Brian Murray (brian-murray)]

I've made most of the changes suggested.

[Steve Langasek (vorlon)]

The changes all look good; I think we still need to sort out the timeout on the snap downloads before pushing this through.

[Steve Langasek (vorlon)]

FWIW I think it would be nicer if the prompt offered to "retry" the failed snap store check, rather than being just a yes/no dialog; but I don't think that should block this MP.

[lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap]

3145. By Brian Murray on 2018-07-05

DistUpgradeQuirks.py: wait for the snap install to complete rather than using a timeout

[Brian Murray (brian-murray)]

On Thu, Jul 05, 2018 at 07:24:45PM -0000, Steve Langasek wrote:
> The changes all look good; I think we still need to sort out the timeout on the snap downloads before pushing this through.

That's sorted with my latest change.

--
Brian Murray

[lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap]

3146. By Brian Murray on 2018-07-06

DistUpgradeQuirks.py: modify the quirks for cosmic

[Steve Langasek (vorlon)]

review: Approve

[lp:~brian-murray/ubuntu-release-upgrader/deb-to-snap]

3147. By Brian Murray on 2018-07-06

clarify docstring

=== modified file 'DistUpgrade/DistUpgradeController.py'
=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2018-07-05 23:22:00 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2018-07-06 18:05:00 +0000
@@ -122,6 +122,19 @@
         """ run before the apt cache is opened the first time """
         logging.debug("running Quirks.PreCacheOpen")
 
+    # individual quirks handler that run *after* the cache is opened
+    def cosmicPostInitialUpdate(self):
+        #PreCacheOpen would be better but controller.abort fails terribly
+        """ run after the apt cache is opened the first time """
+        logging.debug("running Quirks.cosmicPostInitialUpdate")
+        if self.controller.cache['ubuntu-desktop'].is_installed:
+            self._checkStoreConnectivity()
+
+    def cosmicPostUpgrade(self):
+        logging.debug("running Quirks.cosmicPostUpgrade")
+        if self.controller.cache['ubuntu-desktop'].is_installed:
+            self._replaceDebsWithSnaps()
+
     # individual quirks handler when the dpkg run is finished ---------
     def PostCleanup(self):
         " run after cleanup "
@@ -129,6 +142,7 @@
 
     # run right before the first packages get installed
     def StartUpgrade(self):
+        logging.debug("running Quirks.StartUpgrade")
         self._applyPatches()
         self._removeOldApportCrashes()
         self._killUpdateNotifier()
@@ -416,6 +430,68 @@
         except Exception as e:
             logging.warning("error during unlink of old crash files (%s)" % e)
 
+    def _checkStoreConnectivity(self):
+        """ check for connectivity to the snap store to install snaps"""
+        msg = ""
+        summary = ""
+        connected = Popen(["snap", "debug", "connectivity"], stdout=PIPE,
+                          stderr=PIPE, universal_newlines=True).communicate()
+        if re.search("^ \* PASS", connected[0], re.MULTILINE):
+            return
+        # can't connect
+        elif re.search("^ \*.*unreachable", connected[0], re.MULTILINE):
+            logging.error("No snap store connectivity")
+            res = self._view.askYesNoQuestion(
+                _("Connection to Snap Store failed"),
+                _("Your system does not have a connection to the Snap "
+                  "Store. For the best upgrade experience make sure "
+                  "that your system can connect to api.snapcraft.io.\n"
+                  "Do you still want to continue with the upgrade?")
+            )
+        # debug command not available
+        elif 'error: unknown command' in connected[1]:
+            logging.error("snap debug command not available")
+            res = self._view.askYesNoQuestion(
+                _("Outdated snapd package"),
+                _("Your system does not have the latest version of snapd. "
+                  "Please update the version of snapd on your system to "
+                  "improve the upgrade experience.\n"
+                  "Do you still want to continue with the upgrade?")
+            )
+        # not running as root
+        elif 'error: access denied' in connected[1]:
+            res = False
+            logging.error("Not running as root!")
+        if not res:
+            self.controller.abort()
+
+    def _replaceDebsWithSnaps(self):
+        """ install a snap and mark its corresponding package for removal """
+        # gtk-common-themes isn't a package name but is this risky?
+        snaps = ['gtk-common-themes', 'gnome-calculator', 'gnome-characters',
+                 'gnome-logs', 'gnome-system-monitor']
+        installed_snaps = subprocess.Popen(["snap", "list"], stdout=PIPE,
+                                           universal_newlines=True).communicate()
+        for snap in snaps:
+            installed = False
+            # check to see if the snap is already installed
+            if re.search("^%s " % snap, installed_snaps[0], re.MULTILINE):
+                logging.debug("Snap %s is already installed" % snap)
+                installed = True
+            if not installed:
+                try:
+                    proc = subprocess.run(["snap", "install", "--channel",
+                                           "stable/ubuntu-18.04", snap],
+                                          stdout=subprocess.PIPE,
+                                          check=True)
+                except subprocess.CalledProcessError:
+                    logging.debug("Install of snap %s failed" % snap)
+                if proc.returncode == 0:
+                    logging.debug("Install of snap %s succeeded" % snap)
+                    installed = True
+            if installed:
+                self.controller.forced_obsoletes.append(snap)
+
     def _checkPae(self):
         " check PAE in /proc/cpuinfo "
         # upgrade from Precise will fail if PAE is not in cpu flags