[Pkg-haskell-commits] [package-plan] 01/02: test-packages.pl: Let additional-cabals/ override existing files

[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 8b7de41b3cc725febac00b2a27d0377601fa7e07
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 2 22:28:27 2014 +0200

    test-packages.pl: Let additional-cabals/ override existing files
---
 test-packages.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test-packages.pl b/test-packages.pl
index 2d3156d..ddc2233 100755
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -168,7 +168,12 @@ __END__
 	my $version = $2;
 	
 	my $content = read_file($cabalfile);
-	$tar->add_data("$package/$version/$package.cabal", $content);
+	my $filename = "$package/$version/$package.cabal";
+	if ($tar->contains_file($filename)) {
+		$tar->replace_content($filename, $content);
+	} else {
+		$tar->add_data($filename, $content);
+	}
 	}
 
 	print "Applying patches to repository .cabal files...\n";

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