87 lines
2.1 KiB
Diff
87 lines
2.1 KiB
Diff
From 4966dad8a241f431bc064982486b711e02fc0095 Mon Sep 17 00:00:00 2001
|
|
From: Jan Tulak <jtulak@redhat.com>
|
|
Date: Fri, 10 Aug 2018 17:29:48 +0200
|
|
Subject: [PATCH 2/2] change 'python' to 'python3'
|
|
|
|
Future RHEL will have a default of python3.
|
|
|
|
Signed-off-by: Jan Tulak <jtulak@redhat.com>
|
|
---
|
|
Makefile | 8 ++++----
|
|
bin/ssm | 2 +-
|
|
bin/ssm.local | 2 +-
|
|
test.py | 2 +-
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 2d887c4..80ae3f9 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -28,7 +28,7 @@ ifndef PREVIOUS
|
|
endif
|
|
|
|
clean:
|
|
- @python setup.py clean
|
|
+ @python3 setup.py clean
|
|
rm -f MANIFEST
|
|
find . -\( -name "*.pyc" -o -name '*.pyo' -o -name "*~" -\) -delete
|
|
|
|
@@ -36,7 +36,7 @@ git-clean:
|
|
git clean -f
|
|
|
|
install:
|
|
- @python setup.py install
|
|
+ @python3 setup.py install
|
|
|
|
spec: check_vars
|
|
@(LC_ALL=C date +"* %a %b %e %Y `git config --get user.name` <`git config --get user.email`> - $(VERSION)"; git log --pretty="format:- %s (%an)" $(PREVIOUS)..HEAD| cat; echo -e "\n\n"; cat CHANGES) > CHANGES.bck; mv CHANGES.bck CHANGES
|
|
@@ -51,10 +51,10 @@ docs:
|
|
@make dist -C doc
|
|
|
|
source: test clean
|
|
- @python setup.py sdist
|
|
+ @python3 setup.py sdist
|
|
|
|
test:
|
|
- @python test.py
|
|
+ @python3 test.py
|
|
|
|
push_html:
|
|
scp -r doc/_build/singlehtml/* lczerner@shell.sourceforge.net:/home/project-web/storagemanager/htdocs/
|
|
diff --git a/bin/ssm b/bin/ssm
|
|
index 53aece6..13b2241 100755
|
|
--- a/bin/ssm
|
|
+++ b/bin/ssm
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
#
|
|
# (C)2011 Red Hat, Inc., Lukas Czerner <lczerner@redhat.com>
|
|
#
|
|
diff --git a/bin/ssm.local b/bin/ssm.local
|
|
index d5bedec..94ea9dd 100755
|
|
--- a/bin/ssm.local
|
|
+++ b/bin/ssm.local
|
|
@@ -26,7 +26,7 @@ export PYTHONPATH="$SSMDIR"
|
|
|
|
# Run coverage if the environment variable is set up.
|
|
if [ "$RUN_COVERAGE" = "" ]; then
|
|
- python $SSMDIR/bin/ssm "$@"
|
|
+ python3 $SSMDIR/bin/ssm "$@"
|
|
else
|
|
$RUN_COVERAGE $SSMDIR/bin/ssm "$@"
|
|
fi
|
|
diff --git a/test.py b/test.py
|
|
index 7501cc0..247b1dc 100755
|
|
--- a/test.py
|
|
+++ b/test.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
#
|
|
# (C)2011 Red Hat, Inc., Lukas Czerner <lczerner@redhat.com>
|
|
#
|
|
--
|
|
2.16.2
|
|
|