Packages::I18N::Locale: Simplify format string test regex

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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index be7bebd05f1aee4e9f635fd38be82cf7a47dd677..04270f2301b9d29caa59e013d30843bb4f097f00 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -74,16 +74,16 @@ sub read_entry_all {
     while (my ($suite, $provides) = each %virt) {
        next if $suite eq '-';
        if ($opts->{h_suites}{$suite}) {
-           push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+           push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
                              $provides];
        } else {
-           push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+           push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
                                  $provides];
        }
     }
 
     foreach (split(/\000/o, $result||'')) {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
        if ($opts->{h_suites}{$data[1]}
            && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
@@ -123,7 +123,7 @@ sub read_entry_simple {
     # 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 );
+       my @data = split ( /\s/o, $_, 9 );
        debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;
        return [ $virt{$suite}, @data ] if $data[1] eq $suite;
     }
@@ -282,7 +282,9 @@ sub find_similar {
     undef $db;
 
     debug ("ORDER: @order", 2) if DEBUG;
-    return @order[0..10];
+    my $last = 10;
+    $last = $#order if $#order < $last;
+    return @order[0..$last];
 }
 
 sub find_binaries {