Commit c5c55385 authored Sep 26, 2020 by Lukas Bulwahn Committed by Greg Kroah-Hartman Oct 02, 2020

scripts/spdxcheck.py: handle license identifiers in XML comments



Commit cc9539e7 ("media: docs: use the new SPDX header for GFDL-1.1 on
*.svg files") adds SPDX-License-Identifiers enclosed in XML comments,
i.e., <!-- ... -->, for svg files.

Unfortunately, ./scripts/spdxcheck.py does not handle
SPDX-License-Identifiers in XML comments, so it simply fails on checking
these files with 'Invalid License ID: --'.

Strip the XML comment ending simply by copying how it was done for comments
in C. With that, ./scripts/spdxcheck.py handles the svg files properly.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5ec4f0ce

scripts/spdxcheck.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,9 @@ class id_parser(object):
		# Remove trailing comment closure
		if line.strip().endswith('*/'):
		expr = expr.rstrip('*/').strip()
		# Remove trailing xml comment closure
		if line.strip().endswith('-->'):
		expr = expr.rstrip('-->').strip()
		# Special case for SH magic boot code files
		if line.startswith('LIST \"'):
		expr = expr.rstrip('\"').strip()

Admin message