From c4a9939768874cc640e541c1c212af13a4597c54 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 23 Jun 2008 15:29:20 +0000 Subject: o fix --replacepkgs when a same package appears more than once in urpmi db --- NEWS | 1 + urpm/select.pm | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 6f36fd67..dbebe7d6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ - urpmi: o set connection timeout for rsync as well (Anssi) + o fix --replacepkgs when a same package appears more than once in urpmi db - urpmi.addmedia, urpmi.update: o fix --no-md5sum (regression introduced in 5.20) (#41237) diff --git a/urpm/select.pm b/urpm/select.pm index 608540d6..cf176b52 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -288,12 +288,10 @@ sub select_replacepkgs { my $db = urpm::db_open_or_die($urpm, $urpm->{root}); foreach my $id (keys %$requested) { my @pkgs = $urpm->find_candidate_packages_($id); - if (my @installed = grep { URPM::is_package_installed($db, $_) } @pkgs) { - foreach my $pkg (@installed) { + if (my ($pkg) = grep { URPM::is_package_installed($db, $_) } @pkgs) { $urpm->{debug_URPM}("selecting replacepkg " . $pkg->fullname) if $urpm->{debug_URPM}; $pkg->set_flag_requested; $state->{selected}{$pkg->id} = undef; - } } else { $urpm->{fatal}(1, N("found package(s) %s in urpmi db, but none are installed", join(', ', map { scalar($_->fullname) } @pkgs))); } -- cgit v1.2.1