From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Aug 2012 15:55:45 +0000 (-0400)
Subject: python distutils buildsystem: Propigate failure of pyversions. Closes: #683551 Thanks... 
X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=731152b39ab2a84e565dd5b2663ad94c4a656c12

python distutils buildsystem: Propigate failure of pyversions. Closes: #683551 Thanks, Clint Byrum
---

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index ad473a3..4795b7c 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -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),
diff --git a/debian/changelog b/debian/changelog
index 626e420..e397be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ debhelper (9.20120609) UNRELEASED; urgency=low
   * dh_installmime: No longer makes maintainer scripts run update-mime and
     update-mime-database, that is now handled by triggers. Closes: #684689
     Thanks, Charles Plessy
+  * python distutils buildsystem: Propigate failure of pyversions.
+    Closes: #683551 Thanks, Clint Byrum
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Jul 2012 08:51:07 -0600