devtools: fix return of forbidden addition checks
authorArnon Warshavsky <arnon@qwilt.com>
Tue, 18 Dec 2018 15:19:00 +0000 (17:19 +0200)
committerThomas Monjalon <thomas@monjalon.net>
Fri, 21 Dec 2018 00:58:23 +0000 (01:58 +0100)
Explicitly collect the error code of the multiple awk script calls.

Bugzilla ID: 165
Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides")
Cc: stable@dpdk.org
Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
devtools/checkpatches.sh

index ee8debe..3b03b7e 100755 (executable)
@@ -44,6 +44,8 @@ print_usage () {
 }
 
 check_forbidden_additions() { # <patch>
+       res=0
+
        # refrain from new additions of rte_panic() and rte_exit()
        # multiple folders and expressions are separated by spaces
        awk -v FOLDERS="lib drivers" \
@@ -51,7 +53,8 @@ check_forbidden_additions() { # <patch>
                -v RET_ON_FAIL=1 \
                -v MESSAGE='Using rte_panic/rte_exit' \
                -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
-               "$1"
+               "$1" || res=1
+
        # svg figures must be included with wildcard extension
        # because of png conversion for pdf docs
        awk -v FOLDERS='doc' \
@@ -59,7 +62,9 @@ check_forbidden_additions() { # <patch>
                -v RET_ON_FAIL=1 \
                -v MESSAGE='Using explicit .svg extension instead of .*' \
                -f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
-               "$1"
+               "$1" || res = 1
+
+       return $res
 }
 
 number=0