[Pkg-haskell-commits] [package-plan] 01/06: test-packages.pl: fix obsolete binaries

[Joachim Breitner]

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

nomeata pushed a commit to branch new-pandoc
in repository package-plan.

commit d77ceaf8e6d1e8d04c42e03c407b83a36367f979
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Sep 22 13:19:07 2014 +0200

    test-packages.pl: fix obsolete binaries
---
 test-packages.pl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test-packages.pl b/test-packages.pl
index 4c0ca1a..6e98dc0 100755
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -43,22 +43,24 @@ while (<PACKAGES>) {
 		print "Ignoring unparseable line $.: $_\n";
 	}
 	my ($pkg,$version,$attribs) = ($1,$2,$3);
+	$attribs ||= "";
 	$packages{$pkg}++;
-	if ($attribs and $attribs =~ s/obsolete\s*//) {
+
+	$group{$pkg} = $1 if $attribs =~ s/group=([a-z0-9-]+)\s*//;
+	$binary{$pkg} = $1 if $attribs =~ s/binary=([a-z0-9-]+)\s*//;
+	$binary{$pkg} = $pkg if $attribs =~ s/binary\s*//;
+
+	if ($attribs =~ s/obsolete\s*//) {
 		$obsolete{$pkg}++;
 		next;
 	}
-	if ($attribs and $attribs =~ s/avoid\s*//) {
+	if ($attribs =~ s/avoid\s*//) {
 		$avoid{$pkg}++;
 		next;
 	}
 	$versions{$pkg} = $version;
-	next unless $attribs;
 	$ignored{$pkg}++ if $attribs =~ s/ignored?\s*//;
 	$notest{$pkg}++ if $attribs =~ s/notest\s*//;
-	$binary{$pkg} = $1 if $attribs =~ s/binary=([a-z0-9-]+)\s*//;
-	$group{$pkg} = $1 if $attribs =~ s/group=([a-z0-9-]+)\s*//;
-	$binary{$pkg} = $pkg if $attribs =~ s/binary\s*//;
 	$ghcpkg{$pkg}++ if $attribs =~ s/ghcpkg\s*//;
 	$flags{$pkg} = [] unless exists $flags{$pkg};
 	push @{$flags{$pkg}}, $1 while $attribs =~ s/-f([^ ]+)\s*//;

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