[Pkg-haskell-commits] [package-plan] 01/02: Improve test-packages --allow-newer

[Joachim Breitner]

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

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

commit 9bd30d568a1ed08aad194a1a87f95d8595ce046d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 2 10:35:01 2014 +0200

    Improve test-packages --allow-newer
---
 test-packages.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test-packages.pl b/test-packages.pl
index 8f8d874..6770324 100755
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -248,7 +248,12 @@ for my $group (@groups) {
 		# 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};
+		if ($allow_upgrade) {
+			push @params, "--constraint", sprintf "%s (>= %s)", $pkg, $versions{$pkg};
+			push @params, "--preference", sprintf "%s (== %s)", $pkg, $versions{$pkg};
+		} else {
+			push @params, "--constraint", sprintf "%s (== %s)", $pkg, $versions{$pkg};
+		}
 	}
 	for my $pkg (sort keys %versions) {
 		next if (exists $comments{$pkg});

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