Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...

[deb/packages.git] / lib / Packages / Search.pm

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index d3872672edeadfadc8c259d2546b4141631b7121..3a204988504e95d144f23a1f5a31100883494b33 100644 (file)
--- 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;