move obscure function to EOF

[debhelper.git] / Debian / Debhelper / Buildsystem / python_distutils.pm

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 4838cada3c7c5ca4ec5c042895e6b6093c3dfe0d..219c6f9bd633a1592575e1a95770e420e7516c17 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -108,21 +108,24 @@ sub setup_py {
        my $this=shift;
        my $act=shift;
 
-       # We need to to run setup.py with the default python first
+       # We need to to run setup.py with the default python last
        # as distutils/setuptools modifies the shebang lines of scripts.
-       # This ensures that #!/usr/bin/python is used and not pythonX.Y
+       # This ensures that #!/usr/bin/python is installed last and
+       # not pythonX.Y
        # Take into account that the default Python must not be in
        # the requested Python versions.
        # Then, run setup.py with each available python, to build
-        # extensions for each.
+       # extensions for each.
 
         my $python_default = `pyversions -d`;
         $python_default =~ s/^\s+//;
         $python_default =~ s/\s+$//;
         my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
        if (grep /^\Q$python_default\E/, @python_requested) {
-               @python_requested = ("python", grep(!/^\Q$python_default\E/,
-                                       @python_requested));
+               @python_requested = (
+                       grep(!/^\Q$python_default\E/, @python_requested),
+                       "python",
+               );
        }
 
        my @python_dbg;
@@ -137,9 +140,23 @@ sub setup_py {
                }
        }
 
-       foreach my $python (@python_requested, @python_dbg) {
+       foreach my $python (@python_dbg, @python_requested) {
                if (-x "/usr/bin/".$python) {
-                       $this->doit_in_sourcedir($python, "setup.py", $act, @_);
+                       # To allow backports of debhelper we don't pass
+                       # --install-layout=deb to 'setup.py install` for
+                       # those Python versions where the option is
+                       # ignored by distutils/setuptools.
+                       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");
+                       }
+                       else {
+                               $this->doit_in_sourcedir($python, "setup.py",
+                                               $act, @_);
+                       }
                }
        }
 }
@@ -153,10 +170,10 @@ sub install {
        my $this=shift;
        my $destdir=shift;
        $this->setup_py("install",
+               "--force",
                "--root=$destdir",
                "--no-compile",
                "-O0",
-               "--install-layout=deb",
                @_);
 }