X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoNewPkg.pm;h=9be98d54aba8b0724c13106b7d8cf077220116b2;hp=362c4260dd5cb66e122f531e405368f0e1ed6729;hb=e21fe28a63572c2760cac1526a5cbc365df94a0c;hpb=e0996d1bc5a737ae3fbeb9d1598d106ad5496a6a

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index 362c426..9be98d5 100644
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -3,10 +3,7 @@ package Packages::DoNewPkg;
 use strict;
 use warnings;
 
-use Benchmark ':hireswallclock';
-use HTML::Entities;
 use POSIX;
-use XML::RSS;
 use CGI ();
 use Exporter;
 our @ISA = qw( Exporter );
@@ -19,18 +16,18 @@ use Packages::DB;
 use Packages::Config qw( $TOPDIR @SECTIONS $ROOT );
 
 sub do_newpkg {
-    my ($params, $opts, $html_header, $page_content) = @_;
+    my ($params, $opts, $page_content) = @_;
 
     if ($params->{errors}{suite}) {
 	fatal_error( _g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for show (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( sprintf( _g( "more than one suite specified for newpkg (%s)" ), "@{$opts->{suite}}" ) );
     }
 
     my $sort_func = sub { $_[0][0] cmp $_[1][0] };
     $sort_func = sub { $_[0][1] <=> $_[1][1] or $_[0][0] cmp $_[1][0] }
-    if $opts->{mode} eq 'byage';
+	if $opts->{mode} eq 'byage';
 
     my $suite = $opts->{suite}[0];
     my $one_archive = @{$opts->{archive}} == 1 ?
@@ -39,13 +36,18 @@ sub do_newpkg {
 	$opts->{section}[0] : undef;
 
     my @new_pkgs;
-    #FIXME: move to Packages::DB?
-    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info"
-	or die "can't read newpkg_info file: $!";
+    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info_$suite"
+	or do {
+	    warn "can't read newpkg_info_$suite: $!";
+	    fatal_error( sprintf( _g("no newpkg information found for suite %s"),
+				  $suite) );
+	    return;
+    };
     while (<NEWPKG>) {
 	chomp;
-	my @data = split /\s/, $_, 10;
+	my @data = split /\s/, $_, 11;
 
+	next unless $data[2]; #removed packages
 	next unless $data[3] eq $suite;
 	next if $one_archive and $data[2] ne $one_archive;
 	next if $one_section and $data[5] ne $one_section;