From: Mike O'Connor Date: Fri, 2 Jan 2009 22:21:46 +0000 (-0500) Subject: fix removals rss feed when there are fewer than 16 removals X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=59de718cb8f724f092f681090f9022396c0d46a0;p=dak.git fix removals rss feed when there are fewer than 16 removals tools/removals.pl was making the assumption that at least 16 removals exist in removals.txt. If there are not, it creates and rss feed with with bogus empty removals to pad the output to 16 entries. This patch removes this false assumption. Signed-off-by: Mike O'Connor --- diff --git a/tools/removals.pl b/tools/removals.pl index ec65f15c..b07845bf 100755 --- a/tools/removals.pl +++ b/tools/removals.pl @@ -55,14 +55,14 @@ $rss->channel( } ); -for (0..15) { - my $i = $_; +my $num_to_display = 16; +for my $removal (@removals ) { my ($null, $date, $ftpmaster, $body, $reason); - $removals[$i] =~ s/=========================================================================//g; - $removals[$i] =~ m/\[Date: ([^]]+)\] \[ftpmaster: ([^]]+)\]/; + $removal =~ s/=========================================================================//g; + $removal =~ m/\[Date: ([^]]+)\] \[ftpmaster: ([^]]+)\]/; $date = $1; $ftpmaster = $2; - ($null, $body) = split /\n/, $removals[$i], 2; + ($null, $body) = split /\n/, $removal, 2; chomp $body; $body =~ m/---- Reason ---.*\n(.*)/; $reason = $1; @@ -77,5 +77,7 @@ for (0..15) { } ); + $num_to_display -= 1; + last unless $num_to_display; } print $rss->as_string;