Merge ~ack/ubuntu/+source/maas:check-if-snap-configured into ubuntu/+source/maas:ubuntu/devel

[Alberto Donato]

Check (and prompt the user) if the snap is already set up

Also, fix snapd version comparison

[Björn Tillenius (bjornt)]

Looks good to me, with a small comment inline.

review: Approve

095d0fe... by Alberto Donato on 2020-03-09

fix template description

ae33ac4... by Alberto Donato on 2020-03-10

update po files

[Julian Andres Klode (juliank)]

review: Approve

[Julian Andres Klode (juliank)]

Uploaded

Unmerged commits

ae33ac4... by Alberto Donato on 2020-03-10

update po files

095d0fe... by Alberto Donato on 2020-03-09

fix template description

fe0e857... by Alberto Donato on 2020-03-09

changelog

bb7a615... by Alberto Donato on 2020-03-09

fix snapd version comparison

61e673a... by Alberto Donato on 2020-03-09

Check (and prompt the user) if the snap is already set up

da0746b... by Alberto Donato on 2020-02-27

Import patches-unapplied version 1:0.5 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 4b7509341f2cf5e617b5ef5ac1d09b52dd164f4e

New changelog entries:
  * Fix all lintian warning/errors

4b75093... by Alberto Donato on 2020-02-26

Import patches-unapplied version 1:0.4 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Upload parent: 14daa6d5fc4e98104718d3655ea489cf643f48f5

14daa6d... by Alberto Donato on 2020-02-27

fix typo/description

fc1d3e0... by Alberto Donato on 2020-02-26

fix package long description to match as transitional package

f66b3f9... by Alberto Donato on 2020-02-25

Import patches-unapplied version 1:0.3 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: e5187afe6941bd6f22749fbfb6d237c8f3519923

New changelog entries:
  * Set default snap version to 2.7 if default track support is not available in snapd

diff --git a/debian/changelog b/debian/changelog
index 1d34be5..ca80f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maas (1:0.6) focal; urgency=medium
+
+  * Fix snapd version check for default track support
+  * Check if the snap is already installed, prompt the user in case it is
+
+ -- Alberto Donato <[e-mail]>  Mon, 09 Mar 2020 15:11:54 +0100
+
 maas (1:0.5) focal; urgency=medium
 
   * Fix all lintian warning/errors
diff --git a/debian/maas.preinst b/debian/maas.preinst
index 7f40bdc..2279230 100755
--- a/debian/maas.preinst
+++ b/debian/maas.preinst
@@ -7,21 +7,47 @@ DEFAULT_SNAP_TRACK="stable"
 SNAP_COMMON="/var/snap/maas/common"
 
 
-is_installed() {
-    dpkg-query -W -f'${Status}\n' "$1"  2>/dev/null | grep -q ^install
+error_exit() {
+    echo "$@" >&2
+    exit 1
+}
+
+is_deb_installed() {
+    dpkg-query -W -f'${Status}\n' "$1" 2>/dev/null | grep -q ^install
+}
+
+is_snap_installed() {
+    snap list "$1" >/dev/null 2>&1
 }
 
 get_snap_mode() {
-    cat "$SNAP_COMMON/snap_mode" 2>/dev/null || true
+    local snap_mode
+    snap_mode=$(cat "$SNAP_COMMON/snap_mode" 2>/dev/null || true)
+    if [ -z "$snap_mode" ]; then
+        snap_mode="none"
+    fi
+    echo "$snap_mode"
 }
 
 snapd_has_default_track_support() {
     local version
     version=$(snap version | awk '$1 == "snapd" { print $2; }')
-    local major="${version%%.*}"
-    local rest="${version#*.}"
-    local minor="${rest%%.*}"
-    [ "$major" -ge 2 ] && [ "$minor" -ge 44 ]
+    dpkg --compare-versions "$version" ">=" "2.44"
+}
+
+ensure_snap_not_installed() {
+    if ! is_snap_installed maas; then
+        return 0
+    fi
+
+    db_input high maas/snap-reinstall || true
+    db_go || true
+    db_get maas/snap-reinstall
+    if [ "$RET" = "false" ]; then
+        db_fset maas/snap-reinstall seen false
+        error_exit "The MAAS snap is already installed, aborting at user's request"
+    fi
+    snap remove maas
 }
 
 check_connectivity() {
@@ -31,7 +57,7 @@ check_connectivity() {
 
         db_fset maas/snap-no-connectivity seen false
         if ! db_input critical maas/snap-no-connectivity; then
-            db_go
+            db_go || true
 
             case "$count" in
                 0)
@@ -50,11 +76,10 @@ check_connectivity() {
 
             sleep 1m
         else
-            db_go
+            db_go || true
             db_get maas/snap-no-connectivity
             if [ "$RET" = "Abort" ]; then
-                echo "Aborting at user request..."
-                exit 1
+                error_exit "Aborting at user's request."
             fi
             if [ "$count" -eq 0 ]; then
                 echo "Unable to contact the store"
@@ -67,7 +92,7 @@ check_connectivity() {
 
 install_snap() {
     db_input medium maas/snap-track || true
-    db_go
+    db_go || true
     db_get maas/snap-track
     local track="$RET"
     if [ -z "$track" ]; then
@@ -81,24 +106,24 @@ install_snap() {
     fi
 
     snap install maas --channel="${track}/ubuntu-${release}"
-    snap stop maas  # in case the snap was already installed
 }
 
 migrate_to_snap() {
+    snap stop maas
     /snap/maas/current/bin/maas-deb-migrate
     snap start maas
 }
 
 preserve_db() {
-    is_installed maas-region-controller || return 0
+    is_deb_installed maas-region-controller || return 0
     apt-mark manual postgresql
 }
 
 notify_if_not_setup() {
     # only show the notice if MAAS is not setup
-    [ -z "$(get_snap_mode)" ] || return 0
+    [ "$(get_snap_mode)" != "none" ] || return 0
     db_input high maas/snap-needs-setup || true
-    db_go
+    db_go || true
 }
 
 ### main
@@ -111,17 +136,19 @@ case "$1" in
         # only perform tasks in these cases
         ;;
     *)
-        echo "preinst called with unknown argument: $1" >&2
-        exit 1
+        error_exit "preinst called with unknown argument: $1"
         ;;
 esac
 
 . /usr/share/debconf/confmodule
 
+ensure_snap_not_installed
 check_connectivity
 install_snap
-migrate_to_snap
-preserve_db
+if is_deb_installed maas-region-api || is_deb_installed maas-rack-controller; then
+    migrate_to_snap
+    preserve_db
+fi
 notify_if_not_setup
 
 #DEBHELPER#
diff --git a/debian/maas.templates b/debian/maas.templates
index 9598b76..f81df06 100644
--- a/debian/maas.templates
+++ b/debian/maas.templates
@@ -16,8 +16,8 @@ _Description: Unable to reach the snap store
  .
  You can manually check for connectivity by running "snap info maas"
  .
- Aborting will cause the upgrade to fail and will require it to be re-attempted
- once snapd is functional on the system.
+ Aborting will cause the installation to fail and will require it to be
+ re-attempted once snapd is functional on the system.
 
 Template: maas/snap-needs-setup
 Type: note
@@ -30,3 +30,13 @@ _Description: MAAS installed but not set up
  .
  This will interactively ask a set of questions.  Non-interactive set up is
  also available; run with --help to get a full list of available options.
+
+Template: maas/snap-reinstall
+Type: boolean
+_Description: MAAS snap already installed, reinstall it?
+ The MAAS snap is already installed.
+ .
+ To migrate the current deb-based installation, the snap needs to be
+ reinstalled.  All data from the current snap installation will be removed.
+ .
+ Selecting "no" will abort the installation.
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d5b3b09..f8e7823 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: maas\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2020-02-27 13:34+0000\n"
+"POT-Creation-Date: 2020-03-10 12:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -62,7 +62,7 @@ msgstr ""
 #. Description
 #: ../maas.templates:2001
 msgid ""
-"Aborting will cause the upgrade to fail and will require it to be re-"
+"Aborting will cause the installation to fail and will require it to be re-"
 "attempted once snapd is functional on the system."
 msgstr ""
 
@@ -97,3 +97,29 @@ msgid ""
 "This will interactively ask a set of questions.  Non-interactive set up is "
 "also available; run with --help to get a full list of available options."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../maas.templates:4001
+msgid "MAAS snap already installed, reinstall it?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../maas.templates:4001
+msgid "The MAAS snap is already installed."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../maas.templates:4001
+msgid ""
+"To migrate the current deb-based installation, the snap needs to be "
+"reinstalled.  All data from the current snap installation will be removed."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../maas.templates:4001
+msgid "Selecting \"no\" will abort the installation."
+msgstr ""