X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoNewPkg.pm;h=44960896ec23061af29edf30453ab0237166e01a;hb=a6b39cb5eec2cf7d8a0d756f0090a9d8644443c9;hp=60e6876c6274c53a044c933e9b48128e0d842bc9;hpb=09fb5c8a6858850e45adea21c2b8644babfec3de;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index 60e6876..4496089 100644
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -3,16 +3,12 @@ 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 );
 our @EXPORT = qw( do_newpkg );
 
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::CGI;
 use Packages::DB;
@@ -20,12 +16,14 @@ use Packages::Config qw( $TOPDIR @SECTIONS $ROOT );
 
 sub do_newpkg {
     my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->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( $cat->g( "more than one suite specified for newpkg (%s)",
+			      "@{$opts->{suite}}" ) );
     }
 
     my $sort_func = sub { $_[0][0] cmp $_[1][0] };
@@ -39,12 +37,16 @@ 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( $cat->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;