checkstyle: add clang-format dependency, fix bug

Change-Id: I608d3b73700d57652b015a9fc09300e99386a37f
Signed-off-by: Klement Sekera <ksekera@cisco.com>

diff --git a/Makefile b/Makefile
index cf77a41..b812b2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
+DEB_DEPENDS += lcov chrpath autoconf nasm indent clang-format libnuma-dev
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless

diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh
index 6b760b3..f4ea79a 100755 (executable)
--- a/build-root/scripts/checkstyle.sh
+++ b/build-root/scripts/checkstyle.sh
@@ -39,8 +39,8 @@ indent --version
 
 # Check to make sure we have clang-format.  Exit if we don't with an error message, but
 # don't *fail*.
-command -v clang-format > /dev/null
 HAVE_CLANG_FORMAT=0
+command -v clang-format > /dev/null
 if [ $? != 0 ]; then
     echo "Could not find command \"clang-format\". Checking C++ files will cause abort"
 else