Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympus

* github-bantu/ticket/11970:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.

1 files changed, 6 insertions, 5 deletions

diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh
index d9a88edb24..aceb6af7ee 100755
--- a/travis/setup-mariadb.sh
+++ b/travis/setup-mariadb.sh
@@ -4,6 +4,7 @@
 # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 set -e
+set -x
 
 # MariaDB Series
 VERSION='5.5'
@@ -12,18 +13,18 @@ VERSION='5.5'
 OS_CODENAME=$(lsb_release --codename --short)
 
 # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
-sudo apt-get purge -qq mysql-common
+sudo apt-get purge -y mysql-common
 
 if ! which add-apt-repository > /dev/null
 then
-	sudo apt-get update -qq
-	sudo apt-get install -qq python-software-properties
+	sudo apt-get update
+	sudo apt-get install -y python-software-properties
 fi
 
 MIRROR_DOMAIN='ftp.osuosl.org'
 sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
 sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main"
-sudo apt-get update -qq
+sudo apt-get update
 
 # Pin repository in order to avoid conflicts with MySQL from distribution
 # repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files
@@ -36,7 +37,7 @@ Pin-Priority: 1000
 
 sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd"
 sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd"
-sudo apt-get install -qq mariadb-server
+sudo apt-get install -y mariadb-server
 
 # Set root password to empty string.
 echo "