Commit 959b4968 authored Jan 16, 2019 by Thomas Gleixner Committed by Jonathan Corbet Jan 16, 2019

scripts/spdxcheck.py: Handle special quotation mark comments



The SuperH boot code files use a magic format for the SPDX identifier
comment:

  LIST "SPDX-License-Identifier: .... "

The trailing quotation mark is not stripped before the token parser is
invoked and causes the scan to fail. Handle it gracefully.

Fixes: 6a0abce4 ("sh: include: convert to SPDX identifiers")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

parent 6e6c61d3

scripts/spdxcheck.py

+7 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,13 @@ class id_parser(object):
		self.lines_checked += 1
		if line.find("SPDX-License-Identifier:") < 0:
		continue
		expr = line.split(':')[1].replace('*/', '').strip()
		expr = line.split(':')[1].strip()
		# Remove trailing comment closure
		if line.startswith('/*'):
		expr = expr.rstrip('*/').strip()
		# Special case for SH magic boot code files
		if line.startswith('LIST \"'):
		expr = expr.rstrip('\"').strip()
		self.parse(expr)
		self.spdx_valid += 1
		#

Admin message