From 8774c7144b269ce4c90ed9c09d29061cec9ab28a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 22 Mar 2007 21:23:11 +0000 Subject: (perform_installation) better test for packages to remove (no more need to grep results) --- Rpmdrake/pkg.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 1c13f668..7fa2ab5b 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -494,7 +494,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my @pkgs = map { scalar($_->fullname) } sort(grep { $_->flag_selected } @{$urpm->{depslist}});#{ $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$state->{selected}}]; @{$urpm->{ask_remove}} = sort urpm::select::removed_packages($urpm, $urpm->{state}); - my @to_remove = grep { $_ } map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs; + my @to_remove = map { if_($pkgs->{$_}{selected} && !$pkgs->{$_}{pkg}->flag_upgrade, $pkgs->{$_}{urpm_name}) } keys %$pkgs; my $r = join "\n", urpm::select::translate_why_removed($urpm, $urpm->{state}, @to_remove); -- cgit v1.2.1