From 56fa13279e926e7b7662293346e076984e3e5c57 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 23 Sep 2019 10:59:00 -0400 Subject: [PATCH] Explicitly indicate use of python2 RHEL8 will no longer tolerate implicit use of python. For now relent to being python2, though ideally one day it could be either. Unfortunately, this means once code is ready for python3, we have to probably implement build time changes for python3 enabled distros to have different shebangs than python2 distros. --- confluent_client/bin/nodeeventlog | 2 +- confluent_client/bin/nodefirmware | 4 ++-- confluent_client/bin/nodeinventory | 2 +- confluent_client/bin/nodelicense | 2 +- confluent_client/bin/nodemedia | 4 ++-- confluent_client/bin/nodestorage | 2 +- confluent_client/bin/nodesupport | 4 ++-- misc/logreader.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/confluent_client/bin/nodeeventlog b/confluent_client/bin/nodeeventlog index 291f6ac4..46d08604 100755 --- a/confluent_client/bin/nodeeventlog +++ b/confluent_client/bin/nodeeventlog @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2015-2019 Lenovo diff --git a/confluent_client/bin/nodefirmware b/confluent_client/bin/nodefirmware index fa6a3cca..f251f9cf 100755 --- a/confluent_client/bin/nodefirmware +++ b/confluent_client/bin/nodefirmware @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2016-2017 Lenovo @@ -163,4 +163,4 @@ try: update_firmware(session, upfile) except KeyboardInterrupt: print('') -sys.exit(exitcode) \ No newline at end of file +sys.exit(exitcode) diff --git a/confluent_client/bin/nodeinventory b/confluent_client/bin/nodeinventory index 2be1fe27..48259f05 100755 --- a/confluent_client/bin/nodeinventory +++ b/confluent_client/bin/nodeinventory @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2016-2017 Lenovo diff --git a/confluent_client/bin/nodelicense b/confluent_client/bin/nodelicense index ecc5d6fb..b602e733 100755 --- a/confluent_client/bin/nodelicense +++ b/confluent_client/bin/nodelicense @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2019 Lenovo diff --git a/confluent_client/bin/nodemedia b/confluent_client/bin/nodemedia index b4c95723..bb71a8f4 100644 --- a/confluent_client/bin/nodemedia +++ b/confluent_client/bin/nodemedia @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2018 Lenovo @@ -188,4 +188,4 @@ def main(): sys.exit(1) handler(noderange, media) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/confluent_client/bin/nodestorage b/confluent_client/bin/nodestorage index 0cdd30be..e1170d15 100644 --- a/confluent_client/bin/nodestorage +++ b/confluent_client/bin/nodestorage @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2018 Lenovo diff --git a/confluent_client/bin/nodesupport b/confluent_client/bin/nodesupport index c9c1787f..135a16df 100644 --- a/confluent_client/bin/nodesupport +++ b/confluent_client/bin/nodesupport @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2018 Lenovo @@ -144,4 +144,4 @@ def main(): sys.exit(1) handler(noderange, media) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/misc/logreader.py b/misc/logreader.py index 696693c0..8b08d28d 100644 --- a/misc/logreader.py +++ b/misc/logreader.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import collections import os import struct