summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm4
-rw-r--r--urpmi.spec5
2 files changed, 6 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index 16cc5090..4954594f 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1388,7 +1388,7 @@ sub search_packages {
my %l;
foreach (@{$exact_a{$_} || $exact_ra{$_} || $found{$_} || $foundi{$_} || []}) {
my $pkg = $urpm->{depslist}[$_];
- push @{$l{$pkg->name}}, { id => $_, pkg => $pkg };
+ push @{$l{$pkg->name}}, $pkg;
}
if (values(%l) == 0) {
$urpm->{error}(_("no package named %s", $_));
@@ -1400,7 +1400,7 @@ sub search_packages {
foreach (values %l) {
my $best;
foreach (@$_) {
- if ($best) {
+ if ($best && $best != $_) {
$_->compare_pkg($best) > 0 and $best = $_;
} else {
$best = $_;
diff --git a/urpmi.spec b/urpmi.spec
index c859f5a3..0bc81dec 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 3.4
-Release: 4mdk
+Release: 5mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -144,6 +144,9 @@ fi
%changelog
+* Wed Jun 5 2002 François Pons <fpons@mandrakesoft.com> 3.4-5mdk
+- fixed fuzzy search on package (error in urpm.pm around line 1404-1409).
+
* Wed Jun 5 2002 François Pons <fpons@mandrakesoft.com> 3.4-4mdk
- fixed urpmq.
- fixed incomplete requires on some cases.