summaryrefslogtreecommitdiff
path: root/utilities/checkpatch.py
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2018-04-16 13:00:03 -0700
committerBen Pfaff <blp@ovn.org>2018-04-25 08:56:34 -0700
commit9aef43f08593a0886b3b3fd3f88990d2e0be7958 (patch)
tree09351783b1923ea65beacbd2ee529d2064b4e6f4 /utilities/checkpatch.py
parentd5ac645826464cc402b83193f61fdb08cad28412 (diff)
downloadopenvswitch-9aef43f08593a0886b3b3fd3f88990d2e0be7958.tar.gz
checkpatch: Don't do line length or whitespace checks on debian/rules.
debian/rules is a Makefile with a funny name. Signed-off-by: Ben Pfaff <blp@ovn.org> Reviewed-by: Aaron Conole <aconole@redhat.com>
Diffstat (limited to 'utilities/checkpatch.py')
-rwxr-xr-xutilities/checkpatch.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
index 53373f75b..1438e5aa4 100755
--- a/utilities/checkpatch.py
+++ b/utilities/checkpatch.py
@@ -167,13 +167,13 @@ skip_signoff_check = False
# name, as they may have legitimate reasons to have longer lines.
#
# Python isn't checked as flake8 performs these checks during build.
-line_length_blacklist = ['.am', '.at', 'etc', '.in', '.m4', '.mk', '.patch',
- '.py']
+line_length_blacklist = re.compile(
+ r'\.(am|at|etc|in|m4|mk|patch|py)$|debian/rules')
# Don't enforce a requirement that leading whitespace be all spaces on
# files that include these characters in their name, since these kinds
# of files need lines with leading tabs.
-leading_whitespace_blacklist = ['.mk', '.am', '.at']
+leading_whitespace_blacklist = re.compile(r'\.(mk|am|at)$|debian/rules')
def is_subtracted_line(line):
@@ -459,13 +459,13 @@ file_checks = [
checks = [
{'regex': None,
'match_name':
- lambda x: not any([fmt in x for fmt in line_length_blacklist]),
+ lambda x: not line_length_blacklist.match(x),
'check': lambda x: line_length_check(x),
'print': lambda: print_warning("Line length is >79-characters long")},
{'regex': None,
'match_name':
- lambda x: not any([fmt in x for fmt in leading_whitespace_blacklist]),
+ lambda x: not leading_whitespace_blacklist.match(x),
'check': lambda x: not leading_whitespace_is_spaces(x),
'print': lambda: print_warning("Line has non-spaces leading whitespace")},