* Joey Hess <jo...@debian.org>, 2010-02-02, 15:00:
debhelper currently only uses --install-layout=deb when installing for python2.6. The function `install' doesn't use --install-layout=deb, which will install into the wrong site directory when making python2.6 the default. The attached patch unconditionally add this option. maybe you want to add it only when 2.6 or higher is detected as the default python version.Since people expect to be able to backport debhelper, I would prefer to not break those backports by making it use an option that is only supported by newer versions of python. This if statement is intended to do the right thing when pyversions -d sets $python_default to "python2.6". Doesn't it? If not, how can it be fixed? if ( $act eq "install" and not ( ($python =~ /^python(?:-dbg)?$/ and $python_default =~ /^python2\.[2345]$/) or $python =~ /^python2\.[2345](?:-dbg)?$/ )) { $this->doit_in_sourcedir($python, "setup.py", $act, @_, "--install-layout=deb");
The snippet looks correct to me. -- Jakub Wilk
signature.asc
Description: Digital signature