X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=ea6dcfad631a3fa99504e8cd1f30d304b6755984;hb=bc4124c53d65b5ddf5a0504d0479b06aa7cfcb8b;hp=be7bebd05f1aee4e9f635fd38be82cf7a47dd677;hpb=00d2959ac17d719af9cce1c320092e2fbed182a7;p=deb%2Fpackages.git diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index be7bebd..ea6dcfa 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -101,13 +101,14 @@ sub read_entry { read_entry_all( $hash, $key, $results, \@non_results, $opts ); } -#FIXME: make configurable -my %fallback_suites = ( - 'sarge-backports' => 'sarge', - 'sarge-volatile' => 'sarge', - 'etch-backports' => 'etch', - 'etch-volatile' => 'etch', - experimental => 'sid' ); +sub fallback_suite { + my $suite = shift; + if ($suite =~ /^(\S+)-(?:updates|backports)/) { + return $1; + } else { + return undef; + } +} sub read_entry_simple { my ($hash, $key, $archives, $suite) = @_; @@ -127,7 +128,7 @@ sub read_entry_simple { debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite; return [ $virt{$suite}, @data ] if $data[1] eq $suite; } - if (my $fb_suite = $fallback_suites{$suite}) { + if (my $fb_suite = fallback_suite($suite)) { my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite ); my $fb_virt = shift(@$fb_result); $virt{$suite} .= $virt{$suite} ? " $fb_virt" : $fb_virt if $fb_virt;