[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190116153823.GB871@kroah.com>
Date: Wed, 16 Jan 2019 16:38:23 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: LKML <linux-kernel@...r.kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
Simon Horman <horms+renesas@...ge.net.au>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
Rich Felker <dalias@...c.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Kate Stewart <kstewart@...uxfoundation.org>,
Jonathan Corbet <corbet@....net>
Subject: Re: [patch 2/2] scripts/spdxcheck.py: Handle special quotation mark
comments
On Wed, Jan 16, 2019 at 11:26:53AM +0100, Thomas Gleixner wrote:
> 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: 6a0abce4c4cc ("sh: include: convert to SPDX identifiers")
> Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
> Cc: Simon Horman <horms+renesas@...ge.net.au>
> Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp>
> Cc: Rich Felker <dalias@...c.org>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Kate Stewart <kstewart@...uxfoundation.org>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Cc: Jonathan Corbet <corbet@....net>
> ---
> scripts/spdxcheck.py | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> --- a/scripts/spdxcheck.py
> +++ b/scripts/spdxcheck.py
> @@ -175,7 +175,13 @@ import os
> 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
> #
>
>
Reviewed-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Powered by blists - more mailing lists