Skip to contentSkip to conversation

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

PATCH New Lukas Bulwahn 1 participant 1 message Sep 26, 2020 Licenses and spdx stuff

lore
Share & tools
lore
#0 lore raw

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

Commit cc9539e7884c ("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.

---
applies cleanly on current master and next-20200925

Greg, please pick this quick minor patch for your spdx tree. thanks.

 scripts/spdxcheck.py | 3 +++
 1 file changed, 3 insertions(+)
scripts/spdxcheck.py +3 -0
index 6374e078a5f2..bc87200f9c7c 100755
@@ -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()
Signature · 1 line
2.17.1