[Pkg-haskell-commits] [package-plan] 02/02: Make ./test-packages.pl prevent obsolete package (gives better error messages)

[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 f55bf80cefa88e0828c89ecf097b9a1555bdb570
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jun 18 23:25:07 2014 -0700

    Make ./test-packages.pl prevent obsolete package (gives better error messages)
---
 test-packages.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test-packages.pl b/test-packages.pl
index cf41d73..c247db9 100755
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -91,7 +91,7 @@ while ( my ($pkg, $bin) = each %binary ) {
 print "Checking for outdated entries...\n";
 for my $pkg (sort keys %packages) {
 	if ($obsolete{$pkg} && $available{$pkg}) {
-		printf "Obsolete: %s %s\n" ,
+		printf "Obsolete: %s\n" ,
 			$pkg, $available{$pkg};
 		$stats{obsolete}++;
 	} elsif ($obsolete{$pkg} && !$available{$pkg}) {
@@ -246,21 +246,28 @@ for my $group (@groups) {
 
 	push @params, @flags;
 
+	for my $pkg (sort keys %obsolete) {
+		push @params, "--constraint", sprintf "%s (== 42.23.1.2)", $pkg;
+	}
+
 	for my $pkg (sort keys %versions) {
 		next if (exists $comments{$pkg});
 		# For the default group, add all constraints (things might get pulled in)
 		# For other groups, add all constraints from default and the same group
 		next if (defined $group{$pkg} and $group{$pkg} ne $group);
+
 		push @params, "--constraint", sprintf "%s (%s %s)", $pkg, ($allow_upgrade?">=":"==") ,$versions{$pkg};
 	}
 	for my $pkg (sort keys %versions) {
 		next if (exists $comments{$pkg});
 		next if (exists $notest{$pkg});
+		next if (exists $obsolete{$pkg});
 		next if (($group{$pkg} || 'default') ne $group);
 		push @params, sprintf "%s", $pkg;
 	}
 
 	printf "Running cabal-install (group %s)...\n", $group;
+	# printf join(" ", @params)."\n";
 
 	my $out;
 	my $err;

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