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 70307b0fa2023395af5466d0661a8bb65ef3af62..81cff3c9fc8fe15689605f800964f585a0725dbd 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -24,7 +24,7 @@ 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;
 }
@@ -118,9 +118,23 @@ sub setup_py {
        # extensions for each.
 
        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 2>/dev/null`;
+       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),
@@ -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 {