From: Arnon Warshavsky Date: Tue, 18 Dec 2018 15:19:00 +0000 (+0200) Subject: devtools: fix return of forbidden addition checks X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=dafc04c15174e84ca04a7f4ebe67b10c059a5c0c;p=dpdk.git devtools: fix return of forbidden addition checks 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 --- diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index ee8debecf7..3b03b7ef23 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -44,6 +44,8 @@ print_usage () { } check_forbidden_additions() { # + 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() { # -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() { # -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