[Pkg-haskell-commits] [package-plan] 02/02: Changed naming scheme for additional cabal files from "additioal-cabals/<package>/<version>/<package>.cabal" to "additional-cabals/<package>-<version>.cabal".

[Sven Bartscher]

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

svenb-guest pushed a commit to branch master
in repository package-plan.

commit e6aa06701f4a8c9e04af46dac248c0939434a9f3
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Thu Jul 10 23:13:31 2014 +0200

    Changed naming scheme for additional cabal files from
    "additioal-cabals/<package>/<version>/<package>.cabal" to
    "additional-cabals/<package>-<version>.cabal".
---
 .../1.0.0/setlocale.cabal => setlocale-1.0.0.cabal}    |  0
 test-packages.pl                                       | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/additional-cabals/setlocale/1.0.0/setlocale.cabal b/additional-cabals/setlocale-1.0.0.cabal
similarity index 100%
rename from additional-cabals/setlocale/1.0.0/setlocale.cabal
rename to additional-cabals/setlocale-1.0.0.cabal
diff --git a/test-packages.pl b/test-packages.pl
index 870ea05..6f51d39 100755
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -158,16 +158,26 @@ __END__
 	print "Reading 00-list.tar...\n";
 	my $tar = Archive::Tar->new($originaltarpath);
 	print "Adding additional packages...\n";
-	chdir "./additional-cabals";
-	$tar->add_files( glob("./*/*/*.cabal") );
-	chdir "..";
+	for my $cabalfile (<./additional-cabals/*.cabal>) {
+	        unless ($cabalfile =~ m!^./additional-cabals/(.*)-(.*).cabal!) {
+		        printf "Ignoring $cabalfile, does not match not match naming scheme additional-cabals/<pkg>-<version>.cabal";
+			$error_count++;
+			next
+		}
+	my $package = $1;
+	my $version = $2;
+	
+	my $content = read_file($cabalfile);
+	$tar->add_data("$package/$version/$package.cabal", $content);
+	}
+
 	print "Applying patches to repository .cabal files...\n";
 	for my $seriesfile (<./patches/*/*/series>) {
 		unless ($seriesfile =~ m!^./patches/(.*)/(.*?)/series$!) {
 			printf "Ignoring $seriesfile, does not match naming scheme patches/<pkg>/<version>/series\n";
 			$error_count++;
 			next
-		}
+	        }
 		my $pkg = $1;
 		my $version = $2;
 		unless (exists $versions{$pkg}) {

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