[dpdk-stable] patch 'devtools: fix return of forbidden addition checks' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/11/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Kevin Traynor

---
>From c8d23d7b9743b7518d0ed09b20f1f0e5ff5c4a80 Mon Sep 17 00:00:00 2001
From: Arnon Warshavsky <arnon at qwilt.com>
Date: Tue, 18 Dec 2018 17:19:00 +0200
Subject: [PATCH] devtools: fix return of forbidden addition checks

[ upstream commit dafc04c15174e84ca04a7f4ebe67b10c059a5c0c ]

Explicitly collect the error code of the multiple awk script calls.

Bugzilla ID: 165
Fixes: 4d4c612e6a30 ("devtools: check wrong svg include in guides")

Signed-off-by: Arnon Warshavsky <arnon at qwilt.com>
---
 devtools/checkpatches.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index ee8debecf..3b03b7ef2 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -45,4 +45,6 @@ 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
@@ -52,5 +54,6 @@ check_forbidden_additions() { # <patch>
 		-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
@@ -60,5 +63,7 @@ check_forbidden_additions() { # <patch>
 		-v MESSAGE='Using explicit .svg extension instead of .*' \
 		-f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
-		"$1"
+		"$1" || res = 1
+
+	return $res
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:08.452380475 +0000
+++ 0042-devtools-fix-return-of-forbidden-addition-checks.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,13 +1,14 @@
-From dafc04c15174e84ca04a7f4ebe67b10c059a5c0c Mon Sep 17 00:00:00 2001
+From c8d23d7b9743b7518d0ed09b20f1f0e5ff5c4a80 Mon Sep 17 00:00:00 2001
 From: Arnon Warshavsky <arnon at qwilt.com>
 Date: Tue, 18 Dec 2018 17:19:00 +0200
 Subject: [PATCH] devtools: fix return of forbidden addition checks
 
+[ upstream commit dafc04c15174e84ca04a7f4ebe67b10c059a5c0c ]
+
 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 at dpdk.org
 
 Signed-off-by: Arnon Warshavsky <arnon at qwilt.com>
 ---