Use /usr/bin/python2

Part of the effort to port FreeIPA to Arch Linux,
where Python 3 is the default.

FreeIPA hasn't been ported to Python 3, so the code must be modified to
run /usr/bin/python2

https://fedorahosted.org/freeipa/ticket/3438

Updated by pviktori@redhat.com

Makefile

@@ -50,7 +50,7 @@ ifneq ($(DEVELOPER_MODE),0)
 LINT_OPTIONS=--no-fail
 endif
 
-PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python)
+PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python2)
 
 CFLAGS := -g -O2 -Werror -Wall -Wextra -Wformat-security -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers $(CFLAGS)
 export CFLAGS

checks/check-ra.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>
 #   John Dennis <jdennis@redhat.com>

daemons/ipa-otpd/test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # FreeIPA 2FA companion daemon
 #

doc/examples/python-api.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>
 #

freeipa.spec.in

@@ -496,7 +496,7 @@ fi
 
 # Restart IPA processes. This must be also run in postrans so that plugins
 # and software is in consistent state
-python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
+python2 -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
 # NOTE: systemd specific section
 if [  $? -eq 0 ]; then
     /bin/systemctl try-restart ipa.service >/dev/null 2>&1 || :
@@ -532,7 +532,7 @@ fi
         winbind_krb5_locator.so /dev/null 90
 
 %posttrans server-trust-ad
-python -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
+python2 -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1
 if [  $? -eq 0 ]; then
 # NOTE: systemd specific section
     /bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :

install/certmonger/dogtag-ipa-retrieve-agent-submit

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/po/pygettext.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 # -*- coding: iso-8859-1 -*-
 # Originally written by Barry Warsaw <barry@zope.com>
 #

install/restart_scripts/renew_ca_cert

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/restart_scripts/renew_ra_cert

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/restart_scripts/restart_dirsrv

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/restart_scripts/restart_httpd

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/restart_scripts/restart_pkicad

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/restart_scripts/stop_pkicad

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/share/copy-schema-to-ca.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 
 """Copy the IPA schema to the CA directory server instance
 

install/tools/ipa-adtrust-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 #
 # Authors: Sumit Bose <sbose@redhat.com>
 # Based on ipa-server-install by Karl MacMillan <kmacmillan@mentalrootkit.com>

install/tools/ipa-advise

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Tomas Babej <tbabej@redhat.com>
 #
 # Copyright (C) 2013  Red Hat

install/tools/ipa-backup

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2013  Red Hat

install/tools/ipa-ca-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2011  Red Hat

install/tools/ipa-compat-manage

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors: Rob Crittenden <rcritten@redhat.com>
 # Authors: Simo Sorce <ssorce@redhat.com>
 #

install/tools/ipa-csreplica-manage

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Based on ipa-replica-manage by Karl MacMillan <kmacmillan@mentalrootkit.com>

install/tools/ipa-dns-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Martin Nagy <mnagy@redhat.com>
 # Based on ipa-server-install by Karl MacMillan <kmacmillan@mentalrootkit.com>
 #

install/tools/ipa-ldap-updater

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2008  Red Hat

install/tools/ipa-managed-entries

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors: Jr Aquino <jr.aquino@citrix.com>
 #
 # Copyright (C) 2011  Red Hat

install/tools/ipa-nis-manage

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors: Rob Crittenden <rcritten@redhat.com>
 # Authors: Simo Sorce <ssorce@redhat.com>
 #

install/tools/ipa-replica-conncheck

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Martin Kosek <mkosek@redhat.com>
 #
 # Copyright (C) 2011  Red Hat

install/tools/ipa-replica-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
 #
 # Copyright (C) 2007  Red Hat

install/tools/ipa-replica-manage

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
 #
 # Copyright (C) 2007  Red Hat

install/tools/ipa-replica-prepare

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Petr Viktorin <pviktori@redhat.com>
 #
 # Copyright (C) 2012  Red Hat

install/tools/ipa-restore

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2013  Red Hat

install/tools/ipa-server-certinstall

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Jan Cholasta <jcholast@redhat.com>
 #
 # Copyright (C) 2013  Red Hat

install/tools/ipa-server-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
 #          Simo Sorce <ssorce@redhat.com>
 #          Rob Crittenden <rcritten@redhat.com>

install/tools/ipa-upgradeconfig

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

install/tools/ipactl

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors: Simo Sorce <ssorce@redhat.com>
 #
 # Copyright (C) 2008-2010  Red Hat

ipa

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>

ipa-client/ipa-install/ipa-client-automount

@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

ipa-client/ipa-install/ipa-client-install

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 # Authors: Simo Sorce <ssorce@redhat.com>
 #          Karl MacMillan <kmacmillan@mentalrootkit.com>
 #

ipapython/Makefile

@@ -1,4 +1,4 @@
-PYTHONLIBDIR ?= $(shell  python -c "from distutils.sysconfig import *; print get_python_lib()")
+PYTHONLIBDIR ?= $(shell  python2 -c "from distutils.sysconfig import *; print get_python_lib()")
 PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa
 CONFIGDIR ?= $(DESTDIR)/etc/ipa
 TESTS = $(wildcard test/*.py)
@@ -12,9 +12,9 @@ all:
 
 install:
 	if [ "$(DESTDIR)" = "" ]; then \
-		python setup.py install; \
+		python2 setup.py install; \
 	else \
-		python setup.py install --root $(DESTDIR); \
+		python2 setup.py install --root $(DESTDIR); \
 	fi
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
@@ -42,4 +42,4 @@ maintainer-clean: distclean
 test: $(subst .py,.tst,$(TESTS))
 
 %.tst: %.py
-	python $<
+	python2 $<

ipapython/py_default_encoding/Makefile

@@ -1,15 +1,15 @@
-PYTHONLIBDIR ?= $(shell  python -c "from distutils.sysconfig import *; print get_python_lib()")
+PYTHONLIBDIR ?= $(shell  python2 -c "from distutils.sysconfig import *; print get_python_lib()")
 PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa
 CONFIGDIR ?= $(DESTDIR)/etc/ipa
 
 all:
-	python setup.py build
+	python2 setup.py build
 
 install:
 	if [ "$(DESTDIR)" = "" ]; then \
-		python setup.py install; \
+		python2 setup.py install; \
 	else \
-		python setup.py install --root $(DESTDIR); \
+		python2 setup.py install --root $(DESTDIR); \
 	fi
 
 clean:

ipapython/setup.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright (C) 2007  Red Hat
 # see file 'COPYING' for use and warranty information
 #

ipaserver/install/ipa_server_certinstall.py

@@ -1,4 +1,3 @@
-#! /usr/bin/python
 # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
 #          Jan Cholasta <jcholast@redhat.com>
 #

ipatests/i18n.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors:
 #   John Dennis <jdennis@redhat.com>
 #

ipatests/ipa-run-tests

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Authors:
 #   Petr Viktorin <pviktori@redhat.com>

ipatests/ipa-test-config

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 
 # Authors:
 #   Petr Viktorin <pviktori@redhat.com>

ipatests/ipa-test-task

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 
 # Authors:
 #   Petr Viktorin <pviktori@redhat.com>

ipatests/setup.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright (C) 2007  Red Hat
 # see file 'COPYING' for use and warranty information
 #

ipatests/test_ipapython/test_dn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import unittest
 from ipapython.dn import *

ipatests/test_ipapython/test_ipavalidate.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python -E
+#! /usr/bin/python2 -E
 #
 # Copyright (C) 2007    Red Hat
 # see file 'COPYING' for use and warranty information

lite-server.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>

make-lint

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Authors:
 #   Jakub Hrozek <jhrozek@redhat.com>

make-test

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 """
 Run IPA unit tests under multiple versions of Python (if present).

make-testcert

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>

makeapi

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>
 #   John Dennis <jdennis@redhat.com>

setup-client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>