From 4dd916de93d0065ebac5eda0690c23d9fda746a2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 31 Aug 2005 10:19:47 +0000
Subject: create remove_marked_ask_remove() and use it

---
 perl-install/install_steps.pm |  5 +----
 perl-install/pkgs.pm          | 47 +++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0afb51383..3bb6d8644 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -436,10 +436,7 @@ sub installPackages { #- complete REWORK, TODO and TOCHECK!
     my ($o) = @_;
     my $packages = $o->{packages};
 
-    if (%{$packages->{state}{ask_remove} || {}}) {
-	log::l("removing : ", join ', ', keys %{$packages->{state}{ask_remove}});
-	pkgs::remove([ keys %{$packages->{state}{ask_remove}} ], $packages);
-    }
+    pkgs::remove_marked_ask_remove($packages);
 
     #- small transaction will be built based on this selection and depslist.
     my @toInstall = pkgs::packagesToInstall($packages);
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index ab8f2c313..9f001f9fb 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1218,42 +1218,37 @@ sub install {
     fs::loopback::save_boot($loop_boot);
 }
 
-sub remove {
-    my ($toRemove, $packages) = @_;
+sub remove_marked_ask_remove {
+    my ($packages) = @_;
 
+    my @to_remove = keys %{$packages->{state}{ask_remove}} or return;
+    
     delete $packages->{rpmdb}; #- make sure rpmdb is closed before.
 
-    return if !@{$toRemove || []};
+    #- we are not checking depends since it should come when
+    #- upgrading a system. although we may remove some functionalities ?
+
+    remove(\@to_remove);
 
+    delete $packages->{state}{ask_remove}{$_} foreach @to_remove;
+}
+
+sub remove {
+    my ($to_remove) = @_;
+
+    log::l("removing: " . join(' ', @to_remove));
+    
     my $db = rpmDbOpenForInstall() or die "error opening RPM database: ", URPM::rpmErrorString();
     my $trans = $db->create_transaction($::prefix);
 
-    foreach my $p (@$toRemove) {
-	#- stuff remove all packages that matches $p, not a problem since $p has name-version-release format.
-	$trans->remove($p);
-    }
+    #- stuff remove all packages that matches $p, not a problem since $p has name-version-release format.
+    $trans->remove($_) foreach @$to_remove;
 
-    #- we are not checking depends since it should come when
-    #- upgrading a system. although we may remove some functionalities ?
+    installCallback($db, user => undef, remove => scalar @$to_remove);
 
-    #- do not modify/translate the message used with installCallback since
-    #- these are keys during progressing installation, or change in other
-    #- place (install_steps_gtk.pm,...).
-    installCallback($db, user => undef, remove => scalar @$toRemove);
-
-    if (my @probs = $trans->run(undef, force => 1)) {
-	die "removing of old rpms failed:\n  ", join("\n  ", @probs);
-    } else {
-	#- clean ask_remove according to package marked to be deleted.
-	if ($packages) {
-	    foreach my $p (@$toRemove) {
-		delete $packages->{state}{ask_remove}{$p};
-	    }
-	}
+    if (my @pbs = $trans->run(undef, force => 1)) {
+	die "removing of old rpms failed:\n  ", join("\n  ", @pbs);
     }
-
-    #- keep in mind removing of these packages by cleaning $toRemove.
-    @{$toRemove || []} = ();
 }
 
 sub selected_leaves {
-- 
cgit v1.2.1