X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=32ef1e2eedf00d9f8c455966cc2d0dd90f914b44;hp=1851c837845c465582edfc43723e039b733a21f5;hb=a7c90835e393ff56dd9c84f022347554325bc916;hpb=c863d530229051bd598a389a968c5dd2f24ba4c5 diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 1851c83..32ef1e2 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -365,21 +365,31 @@ sub read_entry_simple { my $result = $hash->{$key} || ''; debug( "read_entry_simple: key=$key, archives=". join(" ",(keys %$archives)).", suite=$suite", 1); - my @data_fuzzy; + my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual); foreach (split /\000/o, $result) { my @data = split ( /\s/o, $_, 8 ); debug( "Considering entry ".join( ':', @data), 2); if ($data[1] eq $suite) { - if ($archives->{$data[0]}) { + if ($archives->{$data[0]} + && ($data[2] ne 'virtual')) { debug( "Using entry ".join( ':', @data), 2); return \@data; - } elsif ($data[0] eq 'us') { + } elsif ($archives->{$data[0]}) { + debug( "Virtual entry ".join( ':', @data), 2); + @data_virtual = @data; + } elsif (($data[0] eq 'us') + && ($data[2] ne 'virtual')) { debug( "Fuzzy entry ".join( ':', @data), 2); @data_fuzzy = @data; + } elsif ($data[0] eq 'us') { + debug( "Virtual fuzzy entry ".join( ':', @data), 2); + @data_fuzzy_virtual = @data; } } } - return \@data_fuzzy; + return \@data_virtual if @data_virtual; + return \@data_fuzzy if @data_fuzzy; + return \@data_fuzzy_virtual; } sub read_src_entry_all { my ($hash, $key, $results, $non_results, $opts) = @_;