lkml.org 
[lkml]   [2022]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] checkpatch: explicitly require python3 for codespell
Date
From: Alexander Lobakin <alexandr.lobakin@intel.com>
Date: Tue, 7 Dec 2021 22:13:16 +0100

> Fix a bug where checkpatch couldn't automatically find
> dictionary.txt.
> "Unversioned" `which python` might be not present in a system
> with Python 3 and codespell installed and working. SPDX check
> already refers to `which python3`, do the same for codespell.
>
> Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com>
> ---
> scripts/checkpatch.pl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Ping?

>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 1784921c645d..6943f1e507f1 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -334,7 +334,7 @@ if ($user_codespellfile) {
> } elsif (!(-f $codespellfile)) {
> # If /usr/share/codespell/dictionary.txt is not present, try to find it
> # under codespell's install directory: <codespell_root>/data/dictionary.txt
> - if (($codespell || $help) && which("codespell") ne "" && which("python") ne "") {
> + if (($codespell || $help) && which("codespell") ne "" && which("python3") ne "") {
> my $python_codespell_dict = << "EOF";
>
> import os.path as op
> @@ -344,7 +344,7 @@ codespell_file = op.join(codespell_dir, 'data', 'dictionary.txt')
> print(codespell_file, end='')
> EOF
>
> - my $codespell_dict = `python -c "$python_codespell_dict" 2> /dev/null`;
> + my $codespell_dict = `python3 -c "$python_codespell_dict" 2> /dev/null`;
> $codespellfile = $codespell_dict if (-f $codespell_dict);
> }
> }
> --
> 2.33.1

Al

\
 
 \ /
  Last update: 2022-01-03 15:26    [W:0.051 / U:0.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site