Merge ~callmepk/ubuntu-release-upgrader:ubuntu/focal into ubuntu-release-upgrader:ubuntu/focal

[Patrick Wu]

[Brian Murray (brian-murray)]

I've gone ahead and merge Didier's change which addressed the same issue in a better way.

https://code.launchpad.net/~ubuntu-core-dev/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/411011

review: Disapprove

Unmerged commits

ec9aa7d... by Patrick Wu on 2021-04-27

Fix snap connectivity check failed silently when snapd service not
enabled (LP: #1926267)

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 28122bb..acd217b 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -548,6 +548,19 @@ class DistUpgradeQuirks(object):
         elif 'error: access denied' in connected[1]:
             res = False
             logging.error("Not running as root!")
+        elif '/run/snapd.socket: connect: no such file or directory' in connected[1]:
+                summary = _("Connection to the snapd service failed")
+                msg = _("Connection to the snapd service failed. "
+                        "Please make sure snapd service is enabled "
+                        "in the systemd before release upgrade.\n"
+                        "For WSL users, due to lack of support for "
+                        "systemd, snap will not able to "
+                        "work properly. Please remove snapd package "
+                        "before the distribution update."
+                        )
+                self._view.error(summary, msg)
+                self.controller.abort()
+            )
         if not res:
             self.controller.abort()