From 9d73daf66251237d4bbf4d40e7bee2274d171e92 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Sat, 5 Oct 2019 05:35:11 +0300 Subject: [PATCH] Don't mark dependency packages as manually installed This was causing `apt-get` to refuse to install MariaDB unless one specifies all its corresponding dependency packages on the command line, too. --- .../travis_build_environment/recipes/mysql.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/cookbooks/travis_build_environment/recipes/mysql.rb b/cookbooks/travis_build_environment/recipes/mysql.rb index 3cce05af9..7bc504fe4 100644 --- a/cookbooks/travis_build_environment/recipes/mysql.rb +++ b/cookbooks/travis_build_environment/recipes/mysql.rb @@ -22,10 +22,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +# don't list dependency packages or they'll cause conflicts when installing alternative servers + package %w[ - mysql-client-5.5 - mysql-client-core-5.5 - mysql-common mysql-server-5.5 ] do action %i[remove purge] @@ -41,23 +40,13 @@ mysql_version = 5.6 mysql_pkgs = %w[ libmysqlclient-dev - libmysqlclient18 - mysql-client-5.6 - mysql-client-core-5.6 - mysql-common-5.6 mysql-server-5.6 - mysql-server-core-5.6 ] if node['lsb']['codename'] == 'xenial' || node['lsb']['codename'] == 'bionic' mysql_version = 5.7 mysql_pkgs = %w[ libmysqlclient-dev - libmysqlclient20 - mysql-client-5.7 - mysql-client-core-5.7 - mysql-common mysql-server-5.7 - mysql-server-core-5.7 ] end