[libdbd-mysql-perl] 01/02: smoke-cleanup: "||" the 'mysqladmin shutdown' and the 'kill $pidfile' together

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/tests
in repository libdbd-mysql-perl.

commit 2d5f53c58b492fbe9ae6f870bc9e4a283e93d89d
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Oct 7 11:41:06 2016 +0200

    smoke-cleanup: "||" the 'mysqladmin shutdown' and the 'kill $pidfile' together
    
    the latter is just a fallback if the former fails
    
    thanks: ntyni
    
    Gbp-Dch: Ignore
---
 debian/tests/pkg-perl/smoke-cleanup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/pkg-perl/smoke-cleanup b/debian/tests/pkg-perl/smoke-cleanup
index 9de249e..8523b15 100755
--- a/debian/tests/pkg-perl/smoke-cleanup
+++ b/debian/tests/pkg-perl/smoke-cleanup
@@ -2,6 +2,6 @@
 
 [ -z "$ADTTMP" ] || cd $TDIR
 
-/usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} shutdown 2>&1
+/usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} shutdown 2>&1 || \
 [ ! -s "${MYSQL_PIDFILE}" ] || /bin/kill $(cat "${MYSQL_PIDFILE}") || true
 rm -rf ${MYSQL_DIR}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbd-mysql-perl.git