X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;fp=lib%2FPackages%2FSearch.pm;h=3a47e3d55ae6f2e39881cfec4e4e762068204080;hp=4170863d332360eb2a00822bc37d731f087b647e;hb=98d6d4ed5985e22cfe9824fc1203bc08ecb15c9c;hpb=404f06fb4733c192d438941bc242ff1cc04f739b diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 4170863..3a47e3d 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -101,14 +101,16 @@ sub read_entry { read_entry_all( $hash, $key, $results, \@non_results, $opts ); } -#FIXME: make configurable -my %fallback_suites = ( - 'etch-backports' => 'etch', - 'etch-volatile' => 'etch', - 'lenny-backports' => 'lenny', - 'lenny-volatile' => 'lenny', - 'squeeze-backports' => 'squeeze', - experimental => 'sid' ); +sub fallback_suite { + my $suite = shift; + if ($suite =~ /^(\S+)-(?:updates|backports|volatile)/) { + return $1; + } elsif ($suite eq 'experimental') { + return 'sid'; + } else { + return undef; + } +} sub read_entry_simple { my ($hash, $key, $archives, $suite) = @_; @@ -128,7 +130,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;