From f38365a64a5eb91b63c0657dcbd7496080065ead Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 21 Mar 2007 15:00:14 +0000
Subject: (perform_installation) ask confirmation _before_ actually removing
 packages

---
 Rpmdrake/pkg.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index ef1c1b4b..1c13f668 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -496,9 +496,6 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
     @{$urpm->{ask_remove}} = sort urpm::select::removed_packages($urpm, $urpm->{state});
     my @to_remove = grep { $_ } map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
 
-    # select packages to uninstall for !update mode:
-    perform_removal($urpm, { map { my $p = $pkgs->{$_}; $p->{selected} && $p->{pkg}->flag_installed ? ($_ => $p) : () } keys %$pkgs }) if !$probe_only_for_updates;
-
     my $r = join "\n", urpm::select::translate_why_removed($urpm, $urpm->{state}, @to_remove);
 
     my $install_count = int(@pkgs);
@@ -520,6 +517,9 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
 
     my $_guard = before_leaving { urpm::removable::try_umounting_removables($urpm) };
 
+    # select packages to uninstall for !update mode:
+    perform_removal($urpm, { map { my $p = $pkgs->{$_}; $p->{selected} && $p->{pkg}->flag_installed ? ($_ => $p) : () } keys %$pkgs }) if !$probe_only_for_updates;
+
     Rpmdrake::gurpm::init(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::main_window);
     my $canceled;
     my (@errors);
-- 
cgit v1.2.1