X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=037f7f36ace8798d00da5cf2d23cf1edd3bd13d6;hb=a123e85c68ef74c0ddcaf31321b41bbd4043a655;hp=4c3c31fc8beabf44c9c055a2be5eec9502968475;hpb=09fb5c8a6858850e45adea21c2b8644babfec3de;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 4c3c31f..037f7f3 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -138,7 +138,7 @@ sub do_dispatch {
 
     my $what_to_do = 'show';
     my $source = 0;
-    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
+    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
 	my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
 	debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
@@ -205,8 +205,6 @@ sub do_dispatch {
 		    set_param_once( $input, \%params_set, 'archive', $_);
 		} elsif (!$need_pkg && $sections_descs{$_}) {
 		    set_param_once( $input, \%params_set, 'subsection', $_);
-		} elsif (!$need_pkg && ($_ eq 'non-us')) { # non-US hack
-		    set_param_once( $input, \%params_set, 'subsection', 'non-US');
 		} elsif (!$need_pkg && ($_ eq 'source')) {
 		    set_param_once( $input, \%params_set, 'source', 1);
 		} elsif ($ARCHITECTURES{$_}) {
@@ -316,7 +314,9 @@ Packages::CGI::init_url( $input, \%params, \%opts );
 					     debug => ( DEBUG ? $opts{debug} : 0 ) },
 					   ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
 
-    unless (-e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+    #FIXME: ugly hack
+    unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/)
+            || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
 	fatal_error( "requested format not available for this document",
 		     "406 requested format not available");
     }