[Pkg-mysql-commits] [mariadb-5.5] 02/02: Make sure the one-way migration question is always asked when preinstall runs

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit f3a2750a9ff33447bb8333ae246daeaa22f4e76b
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sun Sep 14 22:20:44 2014 +0300

    Make sure the one-way migration question is always asked when preinstall runs
---
 debian/changelog                  |  1 +
 debian/mariadb-server-5.5.preinst | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d1652c..57ab58a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mariadb-5.5 (5.5.39-2) unstable; urgency=low
   * Re-introduced tha HPPA build patch as the upstream fix wasn't complete
   * Fixed all kFreeBSD build and test suite issues
   * Added Italian translation (Closes: #759813)
+  * Set migration option as unseen if installation was aborted (Closes: #761452)
 
  -- Otto Kekäläinen <otto at seravo.fi>  Wed, 27 Aug 2014 21:12:36 +0300
 
diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst
index f206b58..747c9be 100644
--- a/debian/mariadb-server-5.5.preinst
+++ b/debian/mariadb-server-5.5.preinst
@@ -33,13 +33,13 @@ stop_server() {
     $cmd
     errno=$?
     set -e
-   
+
     # 0=ok, 100=no init script (fresh install)
     if [ "$errno" != 0 -a "$errno" != 100 ]; then
       echo "${cmd/ */} returned $errno" 1>&2
       echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
       echo "Stop it yourself and try again!" 1>&2
-      db_stop  	
+      db_stop
       exit 1
     fi
 }
@@ -53,6 +53,7 @@ if [ -d $DATADIR ]; then
   db_get mariadb-server/oneway_migration || true
   if [ "$RET" = "false" ]; then
     echo "Aborting MariaDB installation." 1>&2
+    db_fset mariadb-server/oneway_migration seen false || true
     db_stop
     exit 1
   fi
@@ -69,9 +70,6 @@ if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /e
   exit 1
 fi
 
-# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades.
-#TODO
-
 # Safe the user from stupidities.
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
@@ -88,7 +86,6 @@ if [ "$show_downgrade_warning" = 1 ]; then
   db_get mariadb-server-5.5/really_downgrade || true
   if [ "$RET" = "true" ]; then
     rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-5.5.flag
   else
     echo "Aborting downgrade from (at least) $found_version to 5.5." 1>&2
     echo "If are sure you want to downgrade to 5.5, remove the file" 1>&2
@@ -112,7 +109,7 @@ fi
 # Now we have to ensure the following state:
 # /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false
 # /etc/group:  mysql:x:101:
-# 
+#
 # Sadly there could any state be present on the system so we have to
 # modify everything carefully i.e. not doing a chown before creating
 # the user etc...
@@ -163,7 +160,7 @@ if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4
 fi
 
 # Since the home directory was created before putting the user into
-# the mysql group and moreover we cannot guarantee that the 
+# the mysql group and moreover we cannot guarantee that the
 # permissions were correctly *before* calling this script, we fix them now.
 # In case we use NIS and no mysql user is present then this script should
 # better fail now than later..

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git