[Pkg-haskell-commits] darcs: tools: Show error output in case of errors

[Joachim Breitner]

Sat Jun 15 11:18:59 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Show error output in case of errors

    M ./all-packages/test-packages.pl -11 +14

Sat Jun 15 11:18:59 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Show error output in case of errors
diff -rN -u old-tools/all-packages/test-packages.pl new-tools/all-packages/test-packages.pl
--- old-tools/all-packages/test-packages.pl	2013-06-15 11:20:55.683220925 +0000
+++ new-tools/all-packages/test-packages.pl	2013-06-15 11:20:55.713619023 +0000
@@ -175,18 +175,21 @@
 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;
 }