- urpmi

  o fix --replacepkgs when a package appears more than once in urpmi db (#40893)
    (need perl-URPM 3.14)

3 files changed, 21 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 5f411b0c..1cf264a9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 - urpmi:
   o --auto-update should behave like urpmi.update when mirrorlist is outdated
     (cf http://forum.mandriva.com/viewtopic.php?t=86837)
+  o fix --replacepkgs when a package appears more than once in urpmi db (#40893)
+    (need perl-URPM 3.14)
 - urpmi.addmedia:
   o add missing mark in "Do you want to add media '%s'?" message (from Nikos)
 - urpmi.addmedia, urpmi.update:
diff --git a/urpm/select.pm b/urpm/select.pm
index c67f4edc..608540d6 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -282,6 +282,24 @@ sub resolve_dependencies {
     $need_restart;
 }
 
+sub select_replacepkgs {
+    my ($urpm, $state, $requested) = @_;
+
+    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) {
+		$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)));
+	}
+    }
+}
+
 sub _priority_upgrade_pkgs {
     my ($urpm, $priority_upgrade_string) = @_;
 
diff --git a/urpmi b/urpmi
index a8f478d5..bf0a94ba 100755
--- a/urpmi
+++ b/urpmi
@@ -479,11 +479,7 @@ sub ask_choice {
 #- packages being upgraded (problably urpmi and perl-URPM, but maybe rpm too, and glibc also ?).
 my $restart_itself;
 if ($options{replacepkgs}) {
-    foreach (keys %requested) {
-	my $pkg = $urpm->{depslist}[$_] or next;
-	$pkg->set_flag_requested;
-	$state->{selected}{$_} = undef;
-    }
+    urpm::select::select_replacepkgs($urpm, $state, \%requested);
 } else {
     $restart_itself = urpm::select::resolve_dependencies($urpm,
     $state,