Commit e6d319f6 authored May 11, 2019 by Sven Eckelmann Committed by Jonathan Corbet May 20, 2019

scripts/spdxcheck.py: Fix path to deprecated licenses



The directory name for other licenses was changed to "deprecated" in
commit 62be257e ("LICENSES: Rename other to deprecated"). But it was
not changed for spdxcheck.py. As result, checkpatch failed with

  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():
    File "/usr/lib/python2.7/dist-packages/git/objects/tree.py", line 298, in __getitem__
      return self.join(item)
    File "/usr/lib/python2.7/dist-packages/git/objects/tree.py", line 244, in join
      raise KeyError(msg % file)
  KeyError: "Blob or Tree named 'other' not found"

Fixes: 62be257e ("LICENSES: Rename other to deprecated")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

parent fba38803

scripts/spdxcheck.py

+1 −1

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

		# The subdirectories of LICENSES in the kernel source
		license_dirs = [ "preferred", "other", "exceptions" ]
		license_dirs = [ "preferred", "deprecated", "exceptions" ]
		lictree = repo.head.commit.tree['LICENSES']

		spdx = SPDXdata()

Admin message