Commit 5c87b0b3 authored by Julien Jehannet's avatar Julien Jehannet
Browse files

[B] setup.py: remove '--install-layout' option for python setup.py correctly

Use python version (<2.5.4) instead of distutils version to detect existence of 'install-layout' option and remove it accordingly.

This option was introduced in 2.5.3-1~exp1 but without distutils version upgrade that breaks installation in last 2.5 series.
The code is still necessary for lenny release and should be removed afterwards.

--HG--
branch : stable
parent 28f5e595e7f0
......@@ -176,8 +176,8 @@ def install(**kwargs):
pass
try:
if not USE_SETUPTOOLS:
from distutils import __version__ as distutils_version
if tuple([int(x) for x in distutils_version.split('.')]) < (2, 5, 1):
# install-layout option was introduced in 2.5.3-1~exp1
if sys.versioninfo < (2, 5, 4):
sys.argv.remove('--install-layout=deb')
print "W: remove '--install-layout=deb' option"
except:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment