[Pkg-haskell-commits] darcs: tools: Fix cabal output parser

[Joachim Breitner]

Thu Dec 12 10:14:51 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Fix cabal output parser

    M ./all-packages/test-packages.pl -2 +5

Thu Dec 12 10:14:51 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Fix cabal output parser
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-12-12 10:14:27.718046554 +0000
+++ new-tools/all-packages/test-packages.pl	2013-12-12 10:14:27.774046540 +0000
@@ -81,7 +81,7 @@
 		printf "MISSING: %s %s\n" ,
 			$pkg, $available{$pkg};
 	} elsif (! exists($available{$pkg})) {
-		printf "New:     %s is %s here but does not exist in the archive.\n" ,
+		printf "Added:   %s is %s here but does not exist in the archive.\n" ,
 			$pkg, $versions{$pkg};
 	} elsif ( version_compare($versions{$pkg}, $available{$pkg}) == -1 ) {
 		printf "OLD:     %s is %s here but %s exists in the archive.\n" ,
@@ -218,7 +218,7 @@
 my $err;
 if (run \@params, \"", \$out, \$err) {
 	my $count=0;
-	while ($out =~ m!^([a-zA-H0-9-]+)-([0-9.]+)$!gm) {
+	while ($out =~ m!^([a-zA-Z0-9-]+)-([0-9.]+)(?: \*test)?(?: \(new package\))?$!gm) {
 		my ($pkg, $version) = ($1, $2);
 		unless (exists $versions{$pkg}) {
 			printf "Additional dependency pulled in: %s-%s\n", $pkg, $version;
@@ -235,6 +235,9 @@
 		$count++;
 	}
 	printf "%s packages successfully tested for co-installability.\n", $count;
+	unless ($count) {
+		printf "Really no packages? output was:\n$out";
+	}
 } else {
 	print "Cabal install failed:\n";
 	print $err;