[Pkg-mysql-commits] [mariadb-5.5] 01/01: Backported the fix of #770177 from 10.0 to 5.5 so that the migration question will not be asked repeatedly.

[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 19cda85f117d914626ad77d3027327b7803dfa98
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Wed Dec 10 22:59:40 2014 +0200

    Backported the fix of #770177 from 10.0 to 5.5 so that the migration
    question will not be asked repeatedly.
---
 debian/changelog                   | 2 ++
 debian/mariadb-server-5.5.postinst | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7dbfc17..9a1662b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mariadb-5.5 (5.5.39-3) UNRELEASED; urgency=low
     the package mariadb-server-5.5 to allow overwriting the innochecksum
     man page file which has changed location (LP: #1368124) as per
     doc https://www.debian.org/doc/debian-policy/ch-relationships.html#s7.6.1
+  * Backported the fix of #770177 from 10.0 to 5.5 so that the migration
+    question will not be asked repeatedly.
 
  -- Otto Kekäläinen <otto at seravo.fi>  Sat, 04 Oct 2014 22:45:02 +0300
 
diff --git a/debian/mariadb-server-5.5.postinst b/debian/mariadb-server-5.5.postinst
index b9f1b98..435b3c9 100644
--- a/debian/mariadb-server-5.5.postinst
+++ b/debian/mariadb-server-5.5.postinst
@@ -134,6 +134,8 @@ EOF
     # data directory and then somewhen gets purged by the admin.
     db_set mysql-server/postrm_remove_database false || true
 
+    # Clean up old flags before setting new one
+    rm $mysql_statedir/debian-*.flag
     # To avoid downgrades.
     touch $mysql_statedir/debian-5.5.flag
 
@@ -146,7 +148,7 @@ EOF
     set +e
     bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
     set -e
-    
+
     ## On every reconfiguration the maintenance user is recreated.
     #
     # - It is easier to regenerate the password every time but as people

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