diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-03-22 21:23:11 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-03-22 21:23:11 +0000 |
| commit | 8774c7144b269ce4c90ed9c09d29061cec9ab28a (patch) | |
| tree | 82e3886ea221a4f18db1b0fcab544834e94102c8 | |
| parent | bdeb166e70af0310e1b4611b62bdb4926e70423f (diff) | |
| download | rpmdrake-8774c7144b269ce4c90ed9c09d29061cec9ab28a.tar rpmdrake-8774c7144b269ce4c90ed9c09d29061cec9ab28a.tar.gz rpmdrake-8774c7144b269ce4c90ed9c09d29061cec9ab28a.tar.bz2 rpmdrake-8774c7144b269ce4c90ed9c09d29061cec9ab28a.tar.xz rpmdrake-8774c7144b269ce4c90ed9c09d29061cec9ab28a.zip | |
(perform_installation) better test for packages to remove (no more need to grep results)
| -rwxr-xr-x | Rpmdrake/pkg.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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); |