X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=b2f4e2c700eeaf9a8b99009eb9174e81a0e37402;hp=0211ec251fdcb99358f3fc1fb8b41c3e974907c8;hb=dc1f8cc1360f5abb632e30e72753e2e132ff9290;hpb=49f6fa5b401d8bba7abc2bafde675841a8729a15

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 0211ec2..b2f4e2c 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -347,10 +347,10 @@ sub read_entry_all {
 	next if $suite eq '-';
 	if ($opts->{h_suites}{$suite}) {
 	    push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
-		(split /\s/, $provides)];
+			      $provides];
 	} else {
 	    push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
-		(split /\s/, $provides)];
+				  $provides];
 	}
     }
 
@@ -372,6 +372,13 @@ sub read_entry {
     my @non_results;
     read_entry_all( $hash, $key, $results, \@non_results, $opts );
 }
+
+#FIXME: make configurable
+my %fallback_suites = (
+		       'stable-backports' => 'stable',
+		       'stable-volatile' => 'stable',
+		       experimental => 'unstable' );
+
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
     # FIXME: drop $archives
@@ -379,12 +386,19 @@ sub read_entry_simple {
     my ($virt, $result) = split /\000/o, $hash->{$key} || "-\01-\0", 2;
     my %virt = split /\01/o, $virt; 
     debug( "read_entry_simple: key=$key, archives=".
-	   join(" ",(keys %$archives)).", suite=$suite", 1);
-    # FIXME: magically encoded a max of 7 suites here by the '8'
-    foreach (split /\000/o, $result, 8) {
+	   join(" ",(keys %$archives)).", suite=$suite", 1) if DEBUG;
+    return [ $virt{$suite} ] unless defined $result;
+    foreach (split /\000/o, $result) {
 	my @data = split ( /\s/o, $_, 8 );
+	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}) {
+	my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite );
+	my $fb_virt = shift(@$fb_result);
+	$virt{$suite} .= $fb_virt if $fb_virt;
+	return [ $virt{$suite}, @$fb_result ] if @$fb_result;
+    }
     return [ $virt{$suite} ];
 }