Commit 8d7a7abf authored May 31, 2019 by Vincenzo Frascino Committed by Linus Torvalds Jun 01, 2019

spdxcheck.py: fix directory structures

The LICENSE directory has recently changed structure and this makes
spdxcheck fails as per below:

FAIL: "Blob or Tree named 'other' not found"
Traceback (most recent call last):
  File "scripts/spdxcheck.py", line 240, in <module>
spdx = read_spdxdata(repo)
  File "scripts/spdxcheck.py", line 41, in read_spdxdata
for el in lictree[d].traverse():
[...]
KeyError: "Blob or Tree named 'other' not found"

Fix the script to restore the correctness on checkpatch License checking.

References: 62be257e ("LICENSES: Rename other to deprecated")
References: 8ea8814f ("LICENSES: Clearly mark dual license only licenses")
Link: http://lkml.kernel.org/r/20190523084755.56739-1-vincenzo.frascino@arm.com


Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Joe Perches <joe@perches.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeremy Cline <jcline@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0600597c

scripts/spdxcheck.py

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,8 @@ class SPDXdata(object):
		def read_spdxdata(repo):

		# The subdirectories of LICENSES in the kernel source
		license_dirs = [ "preferred", "deprecated", "exceptions", "dual" ]
		# Note: exceptions needs to be parsed as last directory.
		license_dirs = [ "preferred", "dual", "deprecated", "exceptions" ]
		lictree = repo.head.commit.tree['LICENSES']

		spdx = SPDXdata()
		@@ -58,13 +59,13 @@ def read_spdxdata(repo):
		elif l.startswith('SPDX-Licenses:'):
		for lic in l.split(':')[1].upper().strip().replace(' ', '').replace('\t', '').split(','):
		if not lic in spdx.licenses:
		raise SPDXException(None, 'Exception %s missing license %s' %(ex, lic))
		raise SPDXException(None, 'Exception %s missing license %s' %(exception, lic))
		spdx.exceptions[exception].append(lic)

		elif l.startswith("License-Text:"):
		if exception:
		if not len(spdx.exceptions[exception]):
		raise SPDXException(el, 'Exception %s is missing SPDX-Licenses' %excid)
		raise SPDXException(el, 'Exception %s is missing SPDX-Licenses' %exception)
		spdx.exception_files += 1
		else:
		spdx.license_files += 1