X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoFilelist.pm;h=ee092e3163ccc1e7afbea4be8eb7a4779925db07;hb=HEAD;hp=97e9f013bea2db584800accdc1c87bbfde3c41ca;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index 97e9f01..ee092e3 100644
--- a/lib/Packages/DoFilelist.pm
+++ b/lib/Packages/DoFilelist.pm
@@ -4,16 +4,12 @@ use strict;
 use warnings;
 
 use POSIX;
-use URI::Escape;
-use HTML::Entities;
 use DB_File;
-use Benchmark ':hireswallclock';
 use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT @SUITES @ARCHIVES @SECTIONS
 			 @ARCHITECTURES %FTP_SITES );
-use Packages::I18N::Locale;
 use Packages::CGI;
 use Packages::DB;
 use Packages::Search qw( :all );
@@ -24,16 +20,17 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( do_filelist );
 
 sub do_filelist {
-    my ($params, $opts, $html_header, $page_content) = @_;
+    my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{package}) {
-	fatal_error( _g( "package not valid or not specified" ) );
+	fatal_error( $cat->g( "package not valid or not specified" ) );
     }
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if ($params->{errors}{arch}) {
-	fatal_error( _g( "architecture not valid or not specified" ) );
+	fatal_error( $cat->g( "architecture not valid or not specified" ) );
     }
 
     my $pkg = $opts->{package};
@@ -48,10 +45,10 @@ sub do_filelist {
 	    O_RDONLY, 0666, $DB_BTREE) {
 
 	    unless (exists $contents{$pkg}) {
-		fatal_error( _g( "No such package in this suite on this architecture." ) );
+		fatal_error( $cat->g( "No such package in this suite on this architecture." ) );
 	    } else {
 		my @files = unpack "L/(CC/a)", $contents{$pkg};
-		my $file;
+		my $file = '';
 
 		$page_content->{files} = [];
 		for (my $i=0; $i<scalar @files;) {
@@ -60,7 +57,7 @@ sub do_filelist {
 		}
 	    }
 	} else {
-	    fatal_error( _g( "Invalid suite/architecture combination" ) );
+	    fatal_error( $cat->g( "Invalid suite/architecture combination" ) );
 	}
     }
 }