X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=e2b64ad0e409db45ff486fc630825a9dc0ec01a7;hb=78590403023af93dddb2df0683214b9bd6d347d2;hp=64790c137041b743f387bdd4ab4a46ad9100b64c;hpb=5b3a2622379c01617e0f69597a887c7625fd40de;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 64790c1..e2b64ad 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -15,7 +15,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 package Packages::Dispatcher;
 
@@ -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{$_}) {
@@ -271,7 +269,7 @@ sub do_dispatch {
 				 array => ',', var => \@archs, replace =>
 				 { any => \@ARCHITECTURES } },
 		       format => { default => 'html', match => '^([\w.]+)$',  },
-		   mode => { default => undef, match => '^(\w+)$',  },
+		   mode => { default => '', match => '^(\w+)$',  },
 		   sort_by => { default => 'file', match => '^(\w+)$', },
 		   );
     my %opts;
@@ -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");
     }