luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Commit cc9539e788 ("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>
This commit is contained in:
Lukas Bulwahn 2020-09-26 21:03:54 +02:00 committed by Greg Kroah-Hartman
parent 5ec4f0ce42
commit c5c5538508
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/spdxcheck.py
View File

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