From 40dcac33ecbeff902da2667f284fb0a037743dfe Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 21 Aug 2017 11:46:12 -0500 Subject: [PATCH] Allow mariadb to be used in place of mysql Some installs have libmariadbclient-dev already installed, so use that if it's available. Change-Id: I630f2f32c3b7b71eb6f348ae6b6838ae8cd6730d --- leap-upgrades/lib/functions.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh index d1cfacb5..fd4b2b1e 100644 --- a/leap-upgrades/lib/functions.sh +++ b/leap-upgrades/lib/functions.sh @@ -419,8 +419,13 @@ function build_venv { failure "Can't install liberasurecode-dev. Enable trusty backports or UCA on this host." exit 99 fi + apt-get -y install liberasurecode-dev > /dev/null - apt-get -y install liberasurecode-dev libmysqlclient-dev > /dev/null + # Install libmysqlclient-dev so that we are later able to build mysql-python + # Allow libmariadbclient-dev to be used instead + if ! apt --installed list | grep libmariadbclient-dev; then + apt-get -y install libmysqlclient-dev > /dev/null + fi ### The venv build is done using a modern version of the py_pkgs plugin which collects all versions of ### the OpenStack components from a given release. This creates 1 large venv per migratory release.