[Pkg-haskell-commits] [package-plan] 128/457: Show error output in case of errors

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository package-plan.

commit 2c3427053d201dfe87a5a695cfb463162434ab23
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Jun 15 11:18:59 2013 +0000

    Show error output in case of errors
---
 test-packages.pl | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/test-packages.pl b/test-packages.pl
index 1a4a227..027b2b7 100644
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -175,18 +175,21 @@ for my $pkg (sort keys %versions) {
 print "Running cabal-install...\n";
 my $out;
 my $err;
-run \@params, \"", \$out, \$err or die "cabal install failed: $?";
-
-while ($out =~ m!^([a-zA-H0-9-]+)-([0-9.]+)$!gm) {
-	my ($pkg, $version) = ($1, $2);
-	unless (exists $versions{$pkg}) {
-		printf "Additional dependency pulled in: %s-%s\n", $pkg, $version;
-		next
-	}
-	unless ($versions{$pkg} eq $version) {
-		printf "ERROR: %s has %s but should have %\n", $pkg, $version, $versions{$pkg};
-		next
+if (run \@params, \"", \$out, \$err) {
+	while ($out =~ m!^([a-zA-H0-9-]+)-([0-9.]+)$!gm) {
+		my ($pkg, $version) = ($1, $2);
+		unless (exists $versions{$pkg}) {
+			printf "Additional dependency pulled in: %s-%s\n", $pkg, $version;
+			next
+		}
+		unless ($versions{$pkg} eq $version) {
+			printf "ERROR: %s has %s but should have %\n", $pkg, $version, $versions{$pkg};
+			next
+		}
 	}
+} else {
+	print "Cabal install failed:\n";
+	print $err;
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git