2021-07-08 10:31:22

by Vincent Pelletier

Subject: [PATCH] checkpatch: Follow scripts/spdxcheck.py's switch to python3

Since commit d0259c42abff ("spdxcheck.py: Use Python 3") spdxcheck.py
expects to be run using python3. "python" may still be a python2 alias.
Instead, obey scripts/spdxcheck.py's shebang by executing it without
pre-selecting an interpreter.
Also, test python3 presence in path.

Signed-off-by: Vincent Pelletier <[email protected]>
---
scripts/checkpatch.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 23697a6b1eaa..a1cbd5fd0856 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1084,10 +1084,10 @@ sub is_maintained_obsolete {
sub is_SPDX_License_valid {
my ($license) = @_;

- return 1 if (!$tree || which("python") eq "" || !(-e "$root/scripts/spdxcheck.py") || !(-e "$gitroot"));
+ return 1 if (!$tree || which("python3") eq "" || !(-e "$root/scripts/spdxcheck.py") || !(-e "$gitroot"));

my $root_path = abs_path($root);
- my $status = `cd "$root_path"; echo "$license" | python scripts/spdxcheck.py -`;
+ my $status = `cd "$root_path"; echo "$license" | scripts/spdxcheck.py -`;
return 0 if ($status ne "");
return 1;
}
--
2.32.0

2021-07-08 17:26:24

by Joe Perches

Subject: Re: [PATCH] checkpatch: Follow scripts/spdxcheck.py's switch to python3

On Thu, 2021-07-08 at 10:29 +0000, Vincent Pelletier wrote:
> Since commit d0259c42abff ("spdxcheck.py: Use Python 3") spdxcheck.py
> expects to be run using python3. "python" may still be a python2 alias.
> Instead, obey scripts/spdxcheck.py's shebang by executing it without
> pre-selecting an interpreter.
> Also, test python3 presence in path.

Thanks, but already done. See:

commit f9363b31d769245cb7ec8a660460800d4b466911
Author: Guenter Roeck <[email protected]>
Date: Wed Jun 30 18:56:19 2021 -0700

checkpatch: scripts/spdxcheck.py now requires python3