python distutils buildsystem: When checking if a version of python is installed,...

[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 219c6f9bd633a1592575e1a95770e420e7516c17..81cff3c9fc8fe15689605f800964f585a0725dbd 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 {
@@ -117,10 +117,24 @@ sub setup_py {
        # Then, run setup.py with each available python, to build
        # 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`;
+       if ($? == -1) {
+               error("failed to run pyversions")
+       }
+       my $ecode = $? >> 8;
+       if ($ecode != 0) {
+               error("pyversions -d failed [$ecode]")
+       }
+       $python_default =~ s/^\s+//;
+       $python_default =~ s/\s+$//;
+       my @python_requested = split ' ', `pyversions -r`;
+       if ($? == -1) {
+               error("failed to run pyversions")
+       }
+       $ecode = $? >> 8;
+       if ($ecode != 0) {
+               error("pyversions -r failed [$ecode]")
+       }
        if (grep /^\Q$python_default\E/, @python_requested) {
                @python_requested = (
                        grep(!/^\Q$python_default\E/, @python_requested),
@@ -129,7 +143,7 @@ sub setup_py {
        }
 
        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;
@@ -141,7 +155,7 @@ sub setup_py {
        }
 
        foreach my $python (@python_dbg, @python_requested) {
-               if (-x "/usr/bin/".$python) {
+               if (-f "/usr/lib/$python/distutils/__init__.py") {
                        # To allow backports of debhelper we don't pass
                        # --install-layout=deb to 'setup.py install` for
                        # those Python versions where the option is
@@ -163,7 +177,9 @@ sub setup_py {
 
 sub build {
        my $this=shift;
-       $this->setup_py("build", @_);
+       $this->setup_py("build",
+               "--force",
+               @_);
 }
 
 sub install {