From dfca237329439b8bb62e2142a60113d563f89e4a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 12 Feb 2016 00:27:17 +0100 Subject: [PATCH] fix errors in pre-commit hook when run in test suite --- hooks/pre-commit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index d33c7018..6dd0049d 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -83,13 +83,13 @@ else err "pep8 is not installed!" fi -if [ ! -z $PY_FILES $PY_TEST_FILES ]; then +if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then err "pyflakes tests failed!" fi fi -if [ ! -z $PY_FILES ]; then +if [ "$PY_FILES" != "" ]; then if ! $PEP8 --ignore=$PEP8_IGNORE $PY_FILES; then err "pep8 tests failed!" fi @@ -98,7 +98,7 @@ fi # The tests use a little hack in order to cleanly import the fdroidserver # package locally like a regular package. pep8 doesn't see that, so this # makes pep8 skip E402 on the test files that need that hack. -if [ ! -z $PY_TEST_FILES ]; then +if [ "$PY_TEST_FILES" != "" ]; then if ! $PEP8 --ignore=$PEP8_IGNORE,E402 $PY_TEST_FILES; then err "pep8 tests failed!" fi -- 2.30.2