summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorXiao-Long Chen <chenxiaolong@cxl.epac.to>2013-11-27 14:53:57 +0100
committerMartin Kosek <mkosek@redhat.com>2014-01-03 09:46:05 +0100
commit5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc (patch)
treedfca5a74b65ee88f7e9ccb868bc7c99b01f739af /install
parent2a2f5ac4e68ed9a819ddc3de1d35366b2e2b58c7 (diff)
downloadfreeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.tar.gz
freeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.tar.xz
freeipa-5e96fbc22afa02f08f71513e7b59d3d5c6a1f9dc.zip
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
Diffstat (limited to 'install')
-rw-r--r--install/certmonger/dogtag-ipa-retrieve-agent-submit2
-rwxr-xr-xinstall/po/pygettext.py2
-rw-r--r--install/restart_scripts/renew_ca_cert2
-rw-r--r--install/restart_scripts/renew_ra_cert2
-rw-r--r--install/restart_scripts/restart_dirsrv2
-rw-r--r--install/restart_scripts/restart_httpd2
-rw-r--r--install/restart_scripts/restart_pkicad2
-rw-r--r--install/restart_scripts/stop_pkicad2
-rwxr-xr-xinstall/share/copy-schema-to-ca.py2
-rwxr-xr-xinstall/tools/ipa-adtrust-install2
-rwxr-xr-xinstall/tools/ipa-advise2
-rwxr-xr-xinstall/tools/ipa-backup2
-rwxr-xr-xinstall/tools/ipa-ca-install2
-rwxr-xr-xinstall/tools/ipa-compat-manage2
-rwxr-xr-xinstall/tools/ipa-csreplica-manage2
-rwxr-xr-xinstall/tools/ipa-dns-install2
-rwxr-xr-xinstall/tools/ipa-ldap-updater2
-rwxr-xr-xinstall/tools/ipa-managed-entries2
-rwxr-xr-xinstall/tools/ipa-nis-manage2
-rwxr-xr-xinstall/tools/ipa-replica-conncheck2
-rwxr-xr-xinstall/tools/ipa-replica-install2
-rwxr-xr-xinstall/tools/ipa-replica-manage2
-rwxr-xr-xinstall/tools/ipa-replica-prepare2
-rwxr-xr-xinstall/tools/ipa-restore2
-rwxr-xr-xinstall/tools/ipa-server-certinstall2
-rwxr-xr-xinstall/tools/ipa-server-install2
-rw-r--r--install/tools/ipa-upgradeconfig2
-rwxr-xr-xinstall/tools/ipactl2
28 files changed, 28 insertions, 28 deletions
diff --git a/install/certmonger/dogtag-ipa-retrieve-agent-submit b/install/certmonger/dogtag-ipa-retrieve-agent-submit
index 70cbd82d7..973af267c 100644
--- a/install/certmonger/dogtag-ipa-retrieve-agent-submit
+++ b/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>
diff --git a/install/po/pygettext.py b/install/po/pygettext.py
index 5293ebf24..4e4212eba 100755
--- a/install/po/pygettext.py
+++ b/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>
#
diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert
index ab394b970..714a79d7c 100644
--- a/install/restart_scripts/renew_ca_cert
+++ b/install/restart_scripts/renew_ca_cert
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert
index e541e4ba4..919f8fc41 100644
--- a/install/restart_scripts/renew_ra_cert
+++ b/install/restart_scripts/renew_ra_cert
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/restart_scripts/restart_dirsrv b/install/restart_scripts/restart_dirsrv
index a9bb897ba..9b22d08c1 100644
--- a/install/restart_scripts/restart_dirsrv
+++ b/install/restart_scripts/restart_dirsrv
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/restart_scripts/restart_httpd b/install/restart_scripts/restart_httpd
index 96f80bd8e..16a41ee5b 100644
--- a/install/restart_scripts/restart_httpd
+++ b/install/restart_scripts/restart_httpd
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/restart_scripts/restart_pkicad b/install/restart_scripts/restart_pkicad
index a58c3f31e..3fe09e7ac 100644
--- a/install/restart_scripts/restart_pkicad
+++ b/install/restart_scripts/restart_pkicad
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad
index c8589b286..9c24a99e4 100644
--- a/install/restart_scripts/stop_pkicad
+++ b/install/restart_scripts/stop_pkicad
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python2 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/share/copy-schema-to-ca.py b/install/share/copy-schema-to-ca.py
index 1888f1251..a5646cd6b 100755
--- a/install/share/copy-schema-to-ca.py
+++ b/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
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index fe86a9464..e81d0ec8f 100755
--- a/install/tools/ipa-adtrust-install
+++ b/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>
diff --git a/install/tools/ipa-advise b/install/tools/ipa-advise
index 4ec3c48c7..6d0d9b95d 100755
--- a/install/tools/ipa-advise
+++ b/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
diff --git a/install/tools/ipa-backup b/install/tools/ipa-backup
index 5bcaa1d8c..bcdcb3065 100755
--- a/install/tools/ipa-backup
+++ b/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
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 4edd26d33..864337c57 100755
--- a/install/tools/ipa-ca-install
+++ b/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
diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage
index 7061a3e5b..bdfb7182a 100755
--- a/install/tools/ipa-compat-manage
+++ b/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>
#
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage
index 438a1b3ab..276eec964 100755
--- a/install/tools/ipa-csreplica-manage
+++ b/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>
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index 37a07f8e3..d87007d2f 100755
--- a/install/tools/ipa-dns-install
+++ b/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>
#
diff --git a/install/tools/ipa-ldap-updater b/install/tools/ipa-ldap-updater
index 0fc5a5bc4..98081d791 100755
--- a/install/tools/ipa-ldap-updater
+++ b/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
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index f13497e12..458339e92 100755
--- a/install/tools/ipa-managed-entries
+++ b/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
diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index 71c0761c6..3320be74a 100755
--- a/install/tools/ipa-nis-manage
+++ b/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>
#
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
index c861e30cf..2c92eb926 100755
--- a/install/tools/ipa-replica-conncheck
+++ b/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
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 0e7aefef4..d29131bdf 100755
--- a/install/tools/ipa-replica-install
+++ b/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
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 989a4ccaf..684000599 100755
--- a/install/tools/ipa-replica-manage
+++ b/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
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare
index 21df34109..4f37b4bee 100755
--- a/install/tools/ipa-replica-prepare
+++ b/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
diff --git a/install/tools/ipa-restore b/install/tools/ipa-restore
index 604175be2..f2572d58a 100755
--- a/install/tools/ipa-restore
+++ b/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
diff --git a/install/tools/ipa-server-certinstall b/install/tools/ipa-server-certinstall
index 9bb0ef850..a0013f653 100755
--- a/install/tools/ipa-server-certinstall
+++ b/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
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 9c9b205ad..dcf0bcebd 100755
--- a/install/tools/ipa-server-install
+++ b/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>
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index 10526f226..dec56c663 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>
diff --git a/install/tools/ipactl b/install/tools/ipactl
index 2db0fde68..3b42b92cf 100755
--- a/install/tools/ipactl
+++ b/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