[dpdk-stable] patch 'devtools: fix file listing in maintainers check' has been queued to stable release 20.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Jul 12 15:04:24 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/21. 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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/d07ee666e60795b12a235089e053f622e860b745

Thanks.

Luca Boccassi

---
>From d07ee666e60795b12a235089e053f622e860b745 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 15 Jun 2021 14:49:49 +0200
Subject: [PATCH] devtools: fix file listing in maintainers check

[ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ]

When having multiple working trees, the main one has a .git directory
while attached trees have a .git file.
Thus the git check should work for both file and directory.

In the case there is no working tree (.git not readable), the command
"find" is used and should be able to list paths with wildcards.
Wildcards work only as shell expansion in the case of file paths,
so the quotes must be removed.

Fixes: 27c2ce563216 ("maintainers: start a Linux-style file")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 devtools/check-maintainers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh
index df3f740b6e..71697bb352 100755
--- a/devtools/check-maintainers.sh
+++ b/devtools/check-maintainers.sh
@@ -15,10 +15,10 @@ files () # <path> [<path> ...]
 	if [ -z "$1" ] ; then
 		return
 	fi
-	if [ -d .git ] ; then
+	if [ -r .git ] ; then
 		git ls-files "$1"
 	else
-		find "$1" -type f |
+		find $1 -type f |
 		sed 's,^\./,,'
 	fi |
 	# if not ended by /
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:38.269726401 +0100
+++ 0029-devtools-fix-file-listing-in-maintainers-check.patch	2021-07-12 13:41:36.290118444 +0100
@@ -1 +1 @@
-From 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b Mon Sep 17 00:00:00 2001
+From d07ee666e60795b12a235089e053f622e860b745 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list