[dpdk-ci] [PATCH 2/2] guess_git_tree: edge case and style changes
ohilyard at iol.unh.edu
ohilyard at iol.unh.edu
Fri Sep 24 18:05:27 CEST 2021
From: Owen Hilyard <ohilyard at iol.unh.edu>
The import statements in the file have been moved below the module doc
comment per PEP 257.
A sanity check has been added to find_filenames. Occasionally, due to
how the community lab internally handles getting patches from
patchworks, a patch will result in no diff. This patch adds handling for
this case.
Signed-off-by: Owen Hilyard <ohilyard at iol.unh.edu>
---
tools/guess_git_tree.py | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/tools/guess_git_tree.py b/tools/guess_git_tree.py
index c9eef39..63892e1 100755
--- a/tools/guess_git_tree.py
+++ b/tools/guess_git_tree.py
@@ -1,20 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# SPDX-License-Identifier: (BSD-3-Clause AND GPL-2.0-or-later AND MIT)
# Copyright 2019 Mellanox Technologies, Ltd
-import os
-import sys
-import re
-import argparse
-import fnmatch
-
-from requests.exceptions import HTTPError
-
-from git_pw import config
-from git_pw import api
-from git_pw import utils
-
"""
Description:
This script uses the git-pw API to retrieve Patchwork's
@@ -49,6 +37,17 @@
tree = maintainers.get_tree(files)
"""
+import os
+import sys
+import re
+import argparse
+import fnmatch
+
+from requests.exceptions import HTTPError
+
+from git_pw import config
+from git_pw import api
+from git_pw import utils
MAINTAINERS_FILE_PATH = os.environ.get('MAINTAINERS_FILE_PATH')
if not MAINTAINERS_FILE_PATH:
@@ -93,6 +92,11 @@ def find_filenames(diff):
- Moved _filename_re into the method.
- Reduced newlines.
"""
+ # sanity check diff
+ # for patches without any diff, it will try to run diff.replace
+ # while diff is None. just return an empty list
+ if diff is None:
+ return []
_filename_re = re.compile(r'^(---|\+\+\+) (\S+)')
# normalise spaces
diff = diff.replace('\r', '')
--
2.30.2
More information about the ci
mailing list