From 5c85bebfe02931bd05b24d8aa9344c7f65fbe60f Mon Sep 17 00:00:00 2001 From: David Stanek Date: Thu, 30 Jul 2015 22:30:44 +0000 Subject: [PATCH] Removes trailing whitespace for bashate Change-Id: I5b0f2d8a128da887565aac0254a1d342b4ec9dc8 --- playbooks/roles/galera_server/files/mysql_init.sh | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/galera_server/files/mysql_init.sh b/playbooks/roles/galera_server/files/mysql_init.sh index 1bdf118fa7..a0a898591d 100644 --- a/playbooks/roles/galera_server/files/mysql_init.sh +++ b/playbooks/roles/galera_server/files/mysql_init.sh @@ -80,7 +80,7 @@ mysqld_status () { ps_alive=0 pidfile=`mysqld_get_param pid-file` if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi - + if [ "$1" = "check_alive" -a $ping_alive = 1 ] || [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then return 0 # EXIT_SUCCESS @@ -164,7 +164,7 @@ case "${1:-''}" in 'restart') set +e; $SELF stop; set -e - $SELF start + $SELF start ;; 'reload'|'force-reload') diff --git a/tox.ini b/tox.ini index f67f1e764b..338360c597 100644 --- a/tox.ini +++ b/tox.ini @@ -28,4 +28,4 @@ commands = bash -c "find {toxinidir} \ -not -path '*/\.*' \ # stay out of the dot directories -name '*sh' \ # all shell scripts please - -print0 | xargs -0 bashate -v -i E001,E002,E003,E010,E011,E020,E041" + -print0 | xargs -0 bashate -v -i E002,E003,E010,E011,E020,E041"