Fixed: Avoid DPKG error while switching from MySQL to MariaDB and vic…

…e-versa Small fixes
i-MSCP · Jan 27, 2014 · d938745 · d938745
1 parent e9844f1
commit d938745
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 6 deletions.
diff --git a/autoinstaller/Adapter/Debian.pm b/autoinstaller/Adapter/Debian.pm
@@ -444,11 +444,6 @@ Do you agree?
 
 	@{$self->{'packagesToUninstall'}} = uniq(@{$self->{'packagesToUninstall'}});
 
-	# Do not remove a package scheduled for installation
-	@{$self->{'packagesToUninstall'}} = grep {
-		not $_ ~~  @{$self->{'packagesToInstall'}}
-	} @{$self->{'packagesToUninstall'}};
-
 	# This test is needed to be sure to not try to remove package no longer available
 	if(@{$self->{'packagesToUninstall'}}) {
 		my ($stdout, $stderr);

diff --git a/docs/Debian/packages-jessie.xml b/docs/Debian/packages-jessie.xml
@@ -60,6 +60,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Debian/packages-squeeze.xml b/docs/Debian/packages-squeeze.xml
@@ -75,6 +75,7 @@
                     >
                 <package>mysql-server-5.1</package>
                 <package>mysql-client-5.1</package>
+                <package>libmysqlclient16</package>
             </mysql_5.1>
             <mysql_5.5
                     pinning_package="mysql-server-5.5 mysql-server-5.5 mysql-common libmysqlclient18"
@@ -86,6 +87,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.3
                     pinning_package="mariadb-client-5.3 mariadb-server-5.3 mariadb-common libmysqlclient16"
@@ -98,6 +100,7 @@
                     >
                 <package>mariadb-client-5.3</package>
                 <package>mariadb-server-5.3</package>
+                <package>libmysqlclient16</package>
             </mariadb_5.3>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common libmysqlclient18"
@@ -110,6 +113,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common libmysqlclient18"
@@ -122,6 +126,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Debian/packages-wheezy.xml b/docs/Debian/packages-wheezy.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
@@ -111,7 +114,7 @@
         <package>php5-imap</package>
         <package>php5-intl</package>
         <package>php5-mcrypt</package>
-        <package>php5-mysql</package>
+        <package>php5-mysqlnd</package>
     </php>
     <perl>
         <package>perl</package>

diff --git a/docs/Ubuntu/packages-lucid.xml b/docs/Ubuntu/packages-lucid.xml
@@ -64,6 +64,7 @@
                     >
                 <package>mysql-server-5.1</package>
                 <package>mysql-client-5.1</package>
+                <package>libmysqlclient16</package>
             </mysql_5.1>
             <mariadb_5.3
                     pinning_package="mariadb-client-5.3 mariadb-server-5.3 mariadb-common mysql-common libmysqlclient16"
@@ -76,6 +77,7 @@
                     >
                 <package>mariadb-client-5.3</package>
                 <package>mariadb-server-5.3</package>
+                <package>libmysqlclient16</package>
             </mariadb_5.3>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -88,6 +90,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -100,6 +103,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Ubuntu/packages-precise.xml b/docs/Ubuntu/packages-precise.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Ubuntu/packages-quantal.xml b/docs/Ubuntu/packages-quantal.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Ubuntu/packages-raring.xml b/docs/Ubuntu/packages-raring.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Ubuntu/packages-saucy.xml b/docs/Ubuntu/packages-saucy.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>

diff --git a/docs/Ubuntu/packages-trusty.xml b/docs/Ubuntu/packages-trusty.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <remote_server>
                 <package>mysql-client</package>