@@ -1,6 +1,33 @@
# See support/scripts/check-package.txt before editing this file.
+def check_consecutive_empty_lines(
+ fname, args, lineno=0, text=None, start=False, end=False):
+ if start:
+ check_consecutive_empty_lines.lastline = "non empty"
+ return
+ if end:
+ return
+ if text.strip() == "" == check_consecutive_empty_lines.lastline.strip():
+ return ["{}:{}: consecutive empty lines".format(fname, lineno)]
+ check_consecutive_empty_lines.lastline = text
+
+
+def check_empty_last_line(
+ fname, args, lineno=0, text=None, start=False, end=False):
+ if start:
+ check_empty_last_line.lastlineno = 0
+ check_empty_last_line.lastline = "non empty"
+ return
+ if end:
+ if check_empty_last_line.lastline.strip() == "":
+ return ["{}:{}: empty line at end of file"
+ .format(fname, check_empty_last_line.lastlineno)]
+ return
+ check_empty_last_line.lastlineno = lineno
+ check_empty_last_line.lastline = text
+
+
def check_newline_at_eof(
fname, args, lineno=0, text=None, start=False, end=False):
if start:
@@ -16,3 +43,14 @@ def check_newline_at_eof(
return
check_newline_at_eof.lastlineno = lineno
check_newline_at_eof.lastline = text
+
+
+def check_trailing_space(
+ fname, args, lineno=0, text=None, start=False, end=False):
+ if start or end:
+ return
+ line = text.rstrip("\r\n")
+ if line != line.rstrip():
+ return ["{}:{}: line contains trailing whitespace"
+ .format(fname, lineno),
+ text]
@@ -4,4 +4,7 @@
# checked by running "make menuconfig".
# Notice: ignore 'imported but unused' from pyflakes for check functions.
+from checkpackagelib import check_consecutive_empty_lines
+from checkpackagelib import check_empty_last_line
from checkpackagelib import check_newline_at_eof
+from checkpackagelib import check_trailing_space
@@ -4,4 +4,7 @@
# "make package-dirclean package-source".
# Notice: ignore 'imported but unused' from pyflakes for check functions.
+from checkpackagelib import check_consecutive_empty_lines
+from checkpackagelib import check_empty_last_line
from checkpackagelib import check_newline_at_eof
+from checkpackagelib import check_trailing_space
@@ -5,4 +5,7 @@
# packages enabled.
# Notice: ignore 'imported but unused' from pyflakes for check functions.
+from checkpackagelib import check_consecutive_empty_lines
+from checkpackagelib import check_empty_last_line
from checkpackagelib import check_newline_at_eof
+from checkpackagelib import check_trailing_space
Create 3 new check functions to warn when: - there are consecutive empty lines in the file, see [1]; - the last line of the file is empty, see [2]; - there are lines with trailing whitespace, see [3]. Apply these functions to Config.in, .mk and .hash, but not for .patch files since they can contain any of these and still be valid. [1] http://patchwork.ozlabs.org/patch/682660/ [2] http://patchwork.ozlabs.org/patch/643288/ [3] http://patchwork.ozlabs.org/patch/398984/ Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> --- Notes: $ time support/scripts/check-package $(find package -type f) >/dev/null 2>/dev/null real 0m0.787s user 0m0.772s sys 0m0.012s CHECK_CONSECUTIVE_EMPTY_LINES: support/scripts/check-package --include-only check_consecutive_empty_lines \ $(find package -type f) 2>/dev/null | wc -l 22 (cd support/scripts/check-package-example && \ ../check-package --include-only check_consecutive_empty_lines -vv package/*/*) package/package1/Config.in:22: consecutive empty lines package/package1/package1.hash:8: consecutive empty lines package/package1/package1.mk:23: consecutive empty lines 159 lines processed 3 warnings generated CHECK_EMPTY_LAST_LINE: support/scripts/check-package --include-only check_empty_last_line \ $(find package -type f) 2>/dev/null | wc -l 17 (cd support/scripts/check-package-example && \ ../check-package --include-only check_empty_last_line -vv package/*/*) package/package1/package1.hash:8: empty line at end of file package/package1/package1.mk:48: empty line at end of file 159 lines processed 2 warnings generated CHECK_TRAILING_SPACE: support/scripts/check-package --include-only check_trailing_space \ $(find package -type f) 2>/dev/null | wc -l 3 (cd support/scripts/check-package-example && \ ../check-package --include-only check_trailing_space -vv package/*/*) package/package1/package1.hash:2: line contains trailing whitespace sha256 1234567890123456789012345678901234567890123456789012345678901234 package1-1.0.tar.gz package/package1/package1.hash:7: line contains trailing whitespace package/package1/package1.mk:7: line contains trailing whitespace PACKAGE1_SITE = https://localhost package/package1/package1.mk:12: line contains trailing whitespace PACKAGE1_INSTALL_STAGING=NO package/package1/package1.mk:13: line contains trailing whitespace PACKAGE1_INSTALL_TARGET = YES< tab > package/package1/package1.mk:48: line contains trailing whitespace < tab > 159 lines processed 6 warnings generated support/scripts/checkpackagelib.py | 38 +++++++++++++++++++++++++++++++ support/scripts/checkpackagelib_config.py | 3 +++ support/scripts/checkpackagelib_hash.py | 3 +++ support/scripts/checkpackagelib_mk.py | 3 +++ 4 files changed, 47 insertions(+)