Make a reminder that fb_suite dealing isn't always giving correct results,

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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index d04f44a3992507509be58892b857da7c9a693196..e863717b97b2e795683a6dd8850bb8f8a84f8f07 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -340,14 +340,26 @@ sub printindexline {
 
 sub read_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;
-    my $result = $hash->{$key} || '';
+    my ($virt, $result) = split /\000/o, $hash->{$key} || "-\01-", 2;
+
+    my %virt = split /\01/o, $virt;
+    while (my ($suite, $provides) = each %virt) {
+       next if $suite eq '-';
+       if ($opts->{h_suites}{$suite}) {
+           push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+                             $provides];
+       } else {
+           push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+                                 $provides];
+       }
+    }
+
     foreach (split /\000/o, $result) {
        my @data = split ( /\s/o, $_, 8 );
        debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
-       if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]}
-           && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all'
-               || $data[2] eq 'virtual')
-           && ($opts->{h_sections}{$data[3]} || $data[3] eq 'v')) {
+       if ($opts->{h_suites}{$data[1]}
+           && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
+           && $opts->{h_sections}{$data[3]}) {
            debug( "Using entry ".join( ':', @data), 2) if DEBUG;
            push @$results, [ $key, @data ];
        } else {
@@ -360,37 +372,39 @@ 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) = @_;
-    my $result = $hash->{$key} || '';
+    # FIXME: drop $archives
+
+    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);
-    my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual);
+          join(" ",(keys %$archives)).", suite=$suite", 1) if DEBUG;
+    # FIXME: not all of the 2^4=16 combinations of empty(results),
+    # empty(virt{suite}), empty(fb_result), empty(virt{fb_suite}) are dealt
+    # with correctly, but it's adequate enough for now
+    return [ $virt{$suite} ] unless defined $result;
     foreach (split /\000/o, $result) {
        my @data = split ( /\s/o, $_, 8 );
-       debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
-       if ($data[1] eq $suite) {
-           if ($archives->{$data[0]}
-               && ($data[2] ne 'virtual')) {
-               debug( "Using entry ".join( ':', @data), 2) if DEBUG;
-               return \@data;
-           } elsif ($archives->{$data[0]}) {
-               debug( "Virtual entry ".join( ':', @data), 2) if DEBUG;
-               @data_virtual = @data;
-           } elsif (($data[0] eq 'us')
-                    && ($data[2] ne 'virtual')) {
-               debug( "Fuzzy entry ".join( ':', @data), 2) if DEBUG;
-               @data_fuzzy = @data;
-           } elsif ($data[0] eq 'us') {
-               debug( "Virtual fuzzy entry ".join( ':', @data), 2) if DEBUG;
-               @data_fuzzy_virtual = @data;
-           }
-       } 
+       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 \@data_virtual if @data_virtual;
-    return \@data_fuzzy if @data_fuzzy;
-    return \@data_fuzzy_virtual;
+    return [ $virt{$suite} ];
 }
+
 sub read_src_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;
     my $result = $hash->{$key} || '';