IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use /usr/bin/python2

Browse Source 
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
This commit is contained in:
Xiao-Long Chen
2013-11-27 14:53:57 +01:00
committed by Martin Kosek
parent 2a2f5ac4e6
commit 5e96fbc22a
54 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipapython/Makefile
View File

@@ -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 $<

8
ipapython/py_default_encoding/Makefile
View File

@@ -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:

2
ipapython/setup.py.in
View File

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