[Pkg-haskell-commits] [package-plan] 325/457: Fix cabal output parser
Joachim Breitner
nomeata at moszumanska.debian.org
Mon Apr 14 20:05:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch master
in repository package-plan.
commit fb92bcbc6905eebf1f3935f5266631e1328c1e9f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Thu Dec 12 10:14:51 2013 +0000
Fix cabal output parser
---
test-packages.pl | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test-packages.pl b/test-packages.pl
index b5b3db2..cd940ba 100644
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -81,7 +81,7 @@ for my $pkg (sort keys %packages) {
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 $out;
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 @@ if (run \@params, \"", \$out, \$err) {
$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;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list