Skip to contentSkip to conversation

scripts/spdxcheck.py - fix list of directories to check

PATCH In review Valdis Klētnieks 2 participants 2 messages May 12, 2019 – May 13, 2019 Licenses and spdx stuff

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/spdxcheck.py - fix list of directories to check

After this commit:

commit 62be257e986dab439537b3e1c19ef746a13e1860

Author: Christoph Hellwig <[email protected]>
Date:   Tue Apr 30 06:51:30 2019 -0400

LICENSES: Rename other to deprecated

checkpatch throws an error:

[/usr/src/linux-next]2 scripts/checkpatch.pl -f drivers/staging/rtl8712/rtl871x_rf.h
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/site-packages/git/objects/tree.py", line 298, in __getitem__
return self.join(item)
File "/usr/lib/python2.7/site-packages/git/objects/tree.py", line 244, in join
raise KeyError(msg % file)
KeyError: "Blob or Tree named 'other' not found"

Fix directory search list. Pick up the new LICENSES/dual while we're there...

scripts/spdxcheck.py +1 -1
index 4fe392e507fb..7abd5f5cb14d 100755
@@ -32,7 +32,7 @@ import os
 def read_spdxdata(repo):
 
     # The subdirectories of LICENSES in the kernel source
-    license_dirs = [ "preferred", "other", "exceptions" ]
+    license_dirs = [ "preferred", "dual", "deprecated", "exceptions" ]
     lictree = repo.head.commit.tree['LICENSES']
 
     spdx = SPDXdata()
#1 lore raw

Thank, this looks good but Sven Eckelmann sent the same changes a little earlier.