]> err.no Git - dak/commitdiff
fix removals rss feed when there are fewer than 16 removals
authorMike O'Connor <stew@debian.org>
Sat, 3 Jan 2009 00:03:10 +0000 (01:03 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 3 Jan 2009 00:03:10 +0000 (01:03 +0100)
To: joerg@debian.org
Date: Fri, 02 Jan 2009 23:28:02 +0100
X-Spam-Status: No, score=-3.586 tagged_above=-99 required=4.6 tests=[AWL=0.013, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1]
User-Agent: Mutt/1.5.18 (2008-05-17)

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 <stew@debian.org>
Signed-off-by: Joerg Jaspert <joerg@debian.org>
tools/removals.pl

index ec65f15c0519daa21527973f5adbecfdb5f741d5..b07845bf0c122d1e04b75b4d5070313ddae7a68d 100755 (executable)
@@ -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;