[Pkg-mysql-commits] r1612 - mysql-dfsg-5.1/branches/experimental/debian

[Christian Hammers]

tags 535500 pending
thanks

Author: ch
Date: 2009-07-03 23:17:36 +0000 (Fri, 03 Jul 2009)
New Revision: 1612

Modified:
   mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
   mysql-dfsg-5.1/branches/experimental/debian/changelog
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.config
Log:
  * Applied Ubuntu patch that sets the debconf prio for the root password
    question to high and prevents it from being asked on 5.0 -> 5.1 upgrades
    (thanks to Mathias Gug). Closes: #535500



Modified: mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-03 23:13:35 UTC (rev 1611)
+++ mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-03 23:17:36 UTC (rev 1612)
@@ -4,7 +4,6 @@
 ###########################
 
 # http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
-* Asking for root passwort has not yet been backported^H^H^H^Htested.
 * Debconf template translations need testing
 * Append --syslog to /etc/mysql/*
 * call the REPAIR TABLE statement for each table that contains any FULLTEXT  indexes.

Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 23:13:35 UTC (rev 1611)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 23:17:36 UTC (rev 1612)
@@ -7,6 +7,9 @@
   * Preinst now prevents Installation if NDB configuration is detected.
   * Applied Ubuntu patch that fixes privilege bootstrapping in postinst
     (thanks to Mathias Gug). Closes: #535492
+  * Applied Ubuntu patch that sets the debconf prio for the root password
+    question to high and prevents it from being asked on 5.0 -> 5.1 upgrades
+    (thanks to Mathias Gug). Closes: #535500
 
  -- Christian Hammers <ch at debian.org>  Wed, 01 Jul 2009 20:54:58 +0200
 

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.config
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.config	2009-07-03 23:13:35 UTC (rev 1611)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.config	2009-07-03 23:17:36 UTC (rev 1612)
@@ -13,13 +13,14 @@
   db_go
 fi
 
-# only ask this question on fresh installs and during "reconfiguration".  
+# only ask this question on fresh installs, during "reconfiguration" and when 
+# not upgrading from an existing 5.0 installation.
 # there is also an additional check for empty root passwords in the
 # postinst script when the tools are available for us to use.
-if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
+if [ "$1" = "configure" ] && ([ -z "$2" ] && [ ! -e "/var/lib/mysql/debian-5.0.flag" ] ) || [ "$1" = "reconfigure" ]; then
   while :; do
     RET=""
-    db_input medium mysql-server/root_password || true
+    db_input high mysql-server/root_password || true
     db_go
     db_get mysql-server/root_password
     # if password isn't empty we ask for password verification
@@ -29,7 +30,7 @@
       break
     fi
     ROOT_PW="$RET"
-    db_input medium mysql-server/root_password_again || true
+    db_input high mysql-server/root_password_again || true
     db_go
     db_get mysql-server/root_password_again
     if [ "$RET" == "$ROOT_PW" ]; then