aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-09-18 12:57:20 +0000
committerThierry Vignaud <tv@mandriva.org>2006-09-18 12:57:20 +0000
commitdfea331f53a75a702b6bb366fad9dbd675c95081 (patch)
treedb0322b0531178a6306cec463f8cc82a048a4378
parent6e3379ac7af9db3d40fd762bbb63d7f8ee3d35d7 (diff)
downloadrpmdrake-dfea331f53a75a702b6bb366fad9dbd675c95081.tar
rpmdrake-dfea331f53a75a702b6bb366fad9dbd675c95081.tar.gz
rpmdrake-dfea331f53a75a702b6bb366fad9dbd675c95081.tar.bz2
rpmdrake-dfea331f53a75a702b6bb366fad9dbd675c95081.tar.xz
rpmdrake-dfea331f53a75a702b6bb366fad9dbd675c95081.zip
(perform_installation) prevent dummy "unable to remove package" error dialog (#25680)
-rwxr-xr-xrpmdrake3
1 files changed, 2 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index 5c522df9..d8ad2ab7 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1774,7 +1774,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
# FIXME: $_ is trashed:
my @pkgs = map { my $c = $_->fullname; $c } sort(grep { $_->flag_selected } @{$urpm->{depslist}});#{ $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$state->{selected}}];
@{$urpm->{ask_remove}} = sort $urpm->removed_packages($urpm->{state});
- my @to_remove = uniq(@{$urpm->{ask_remove}}, map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs);
+ my @to_remove = uniq(@{$urpm->{ask_remove}}, grep { $_ } map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs);
+
my $r = join "\n", $urpm->translate_why_removed($urpm->{state}, @to_remove);
my $install_count = int(@pkgs);