debhelper: Fix minor source comment typos.

[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..ad473a3916085aa6ad69ec44f8b8a42609e2a2ed 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -24,14 +24,14 @@ sub DEFAULT_BUILD_DIRECTORY {
 sub new {
        my $class=shift;
        my $this=$class->SUPER::new(@_);
-       # Out of source tree building is prefered.
+       # Out of source tree building is preferred.
        $this->prefer_out_of_source_building(@_);
        return $this;
 }
 
 sub check_auto_buildable {
        my $this=shift;
-       return -e $this->get_sourcepath("setup.py");
+       return -e $this->get_sourcepath("setup.py") ? 1 : 0;
 }
 
 sub not_our_cfg {
@@ -108,25 +108,28 @@ 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`;
+       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;
-        my @dbg_build_needed = $this->dbg_build_needed();
+       my @dbg_build_needed = $this->dbg_build_needed();
        foreach my $python (map { $_."-dbg" } @python_requested) {
                if (grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) {
                        push @python_dbg, $python;
@@ -137,26 +140,42 @@ 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, @_);
+                       }
                }
        }
 }
 
 sub build {
        my $this=shift;
-       $this->setup_py("build", @_);
+       $this->setup_py("build",
+               "--force",
+               @_);
 }
 
 sub install {
        my $this=shift;
        my $destdir=shift;
        $this->setup_py("install",
+               "--force",
                "--root=$destdir",
                "--no-compile",
                "-O0",
-               "--install-layout=deb",
                @_);
 }