linux-kernel - [PATCH] scripts/spdxcheck-test.sh: Drop python2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Wed, 7 Jul 2021 16:06:00 -0500
From:   Nishanth Menon <nm@...com>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Thomas Gleixner <tglx@...utronix.de>
CC:     <linux-kernel@...r.kernel.org>, <linux-spdx@...r.kernel.org>,
        Nishanth Menon <nm@...com>, Bert Vermeulen <bert@...t.com>
Subject: [PATCH] scripts/spdxcheck-test.sh: Drop python2

Since commit d0259c42abff ("spdxcheck.py: Use Python 3"), spdxcheck.py
explicitly expects to run as python3 script, there is no further point
in attempting to test with python2.

Cc: Bert Vermeulen <bert@...t.com>
Signed-off-by: Nishanth Menon <nm@...com>
---

Also see checkpatch.pl patch
https://lore.kernel.org/lkml/20210505211720.447111-1-linux@roeck-us.net/

PS: While it may be debatable if *ever* there is going to be a python4
and hence leave the for loop alone (in addition to reducing the
diffstat). I just took the path where I hope if we ever see that day,
we pick one version.

 scripts/spdxcheck-test.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/spdxcheck-test.sh b/scripts/spdxcheck-test.sh
index cfea6a0d1cc0..cb76324756bd 100644
--- a/scripts/spdxcheck-test.sh
+++ b/scripts/spdxcheck-test.sh
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-for PYTHON in python2 python3; do
-	# run check on a text and a binary file
-	for FILE in Makefile Documentation/logo.gif; do
-		$PYTHON scripts/spdxcheck.py $FILE
-		$PYTHON scripts/spdxcheck.py - < $FILE
-	done
-
-	# run check on complete tree to catch any other issues
-	$PYTHON scripts/spdxcheck.py > /dev/null
+# run check on a text and a binary file
+for FILE in Makefile Documentation/logo.gif; do
+	python3 scripts/spdxcheck.py $FILE
+	python3 scripts/spdxcheck.py - < $FILE
 done
+
+# run check on complete tree to catch any other issues
+python3 scripts/spdxcheck.py > /dev/null
-- 
2.32.0