From: Frank Lichtenheld Date: Sun, 2 Sep 2007 21:46:08 +0000 (+0000) Subject: Packages::Dispatcher: Handle suite aliases correctly in suite parameter X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=470cef634604cba4d29e399093feed4b97196c66;p=deb%2Fpackages.git Packages::Dispatcher: Handle suite aliases correctly in suite parameter Handle suite aliases correctly in query parameters, too; not only in PATH_INFO --- diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index 9d38c17..7973d0d 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -65,6 +65,13 @@ sub do_dispatch { delete $ENV{'LC_ALL'}; delete $ENV{'LC_MESSAGES'}; + my %SUITES_ALIAS = ( oldstable => 'sarge', + stable => 'etch', + testing => 'lenny', + unstable => 'sid', + '3.1' => 'sarge', + '4.0' => 'etch' ); + # Read in all the variables set by the form my $input; if ($ARGV[0] && ($ARGV[0] eq 'php')) { @@ -168,14 +175,6 @@ sub do_dispatch { } my %SUITES = map { $_ => 1 } @SUITES; - my %SUITES_ALIAS = ( sarge => 'oldstable', - etch => 'stable', - lenny => 'testing', - sid => 'unstable', - oldstable => 'sarge', - stable => 'etch', - testing => 'lenny', - unstable => 'sid', ); my %SECTIONS = map { $_ => 1 } @SECTIONS; my %ARCHIVES = map { $_ => 1 } @ARCHIVES; my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all', 'any'); @@ -244,7 +243,8 @@ sub do_dispatch { suite => { default => 'default', match => '^([\w-]+)$', array => ',', var => \@suites, replace => { all => \@SUITES, - default => \@SUITES } }, + default => \@SUITES, + %SUITES_ALIAS } }, archive => { default => ($what_to_do eq 'search') ? 'all' : 'default', match => '^([\w-]+)$',