diff options
| -rw-r--r-- | urpm.pm | 22 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
2 files changed, 19 insertions, 9 deletions
@@ -1315,14 +1315,20 @@ sub search_packages { #- search through provides to find if a provide match this one. #- but manages choices correctly (as a provides may be virtual or #- multiply defined. - /$qv/ and push @{$found{$v}}, join '|', grep { defined $_ } - map { my $pkg = $urpm->{params}{info}{$_}; - $pkg && ($options{src} ? $pkg->{arch} eq 'src' : $pkg->{arch} ne 'src') && $pkg->{id} || undef } - keys %{$urpm->{params}{provides}{$_}}; - /$qv/i and push @{$found{$v}}, join '|', grep { defined $_ } - map { my $pkg = $urpm->{params}{info}{$_}; - $pkg && ($options{src} ? $pkg->{arch} eq 'src' : $pkg->{arch} ne 'src') && $pkg->{id} || undef } - keys %{$urpm->{params}{provides}{$_}}; + if (/$qv/) { + my @list = grep { defined $_ } + map { my $pkg = $urpm->{params}{info}{$_}; + $pkg && ($options{src} ? $pkg->{arch} eq 'src' : $pkg->{arch} ne 'src') && $pkg->{id} || undef } + keys %{$urpm->{params}{provides}{$_}}; + @list > 0 and push @{$found{$v}}, join '|', @list; + } + if (/$qv/i) { + my @list = grep { defined $_ } + map { my $pkg = $urpm->{params}{info}{$_}; + $pkg && ($options{src} ? $pkg->{arch} eq 'src' : $pkg->{arch} ne 'src') && $pkg->{id} || undef } + keys %{$urpm->{params}{provides}{$_}}; + @list > 0 and push @{$found{$v}}, join '|', @list; + } } } @@ -2,7 +2,7 @@ Name: urpmi Version: 3.3 -Release: 24mdk +Release: 25mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -144,6 +144,10 @@ fi %changelog +* Thu Apr 11 2002 François Pons <fpons@mandrakesoft.com> 3.3-25mdk +- fixed a problem for searching package according to name when + nothing should be found but other package are proposed. + * Wed Apr 10 2002 François Pons <fpons@mandrakesoft.com> 3.3-24mdk - fixed package that need to be upgraded but which is provided by another package (Mesa and XFree86-libs). |