kernelnewbies.kernelnewbies.org archive mirror
 help / color / mirror / Atom feed
From: "Valdis Klētnieks" <valdis.kletnieks@vt.edu>
To: Andrew Morton <akpm@linux-foundation.org>,
	Deepak Mishra <linux.dkm@gmail.com>,
	Christoph Hellwig <hch@lst.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jeremy Cline <jcline@redhat.com>
Cc: linux-kernel@vger.kernel.org, kernelnewbies@kernelnewbies.org
Subject: [PATCH] scripts/spdxcheck.py - fix list of directories to check
Date: Sun, 12 May 2019 03:40:28 -0400	[thread overview]
Message-ID: <2008.1557646828@turing-police> (raw)

After this commit:

commit 62be257e986dab439537b3e1c19ef746a13e1860
Author: Christoph Hellwig <hch@lst.de>
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...

Reported-by: Deepak Mishra <linux.dkm@gmail.com>
Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>

diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 4fe392e507fb..7abd5f5cb14d 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -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()



_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

             reply	other threads:[~2019-05-12  7:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-12  7:40 Valdis Klētnieks [this message]
2019-05-13  6:39 ` [PATCH] scripts/spdxcheck.py - fix list of directories to check Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2008.1557646828@turing-police \
    --to=valdis.kletnieks@vt.edu \
    --cc=akpm@linux-foundation.org \
    --cc=hch@lst.de \
    --cc=jcline@redhat.com \
    --cc=kernelnewbies@kernelnewbies.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux.dkm@gmail.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).