aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-11-29 11:55:52 +0000
committerThierry Vignaud <tv@mandriva.org>2006-11-29 11:55:52 +0000
commit73dfb00d48a836b17d2e96909b13c3fd5f18105e (patch)
tree97c5856b740b19917a9caa02a3640b6a4b86f875
parent3f987ccbc6f70522d41374109b60ab01c1e19f87 (diff)
downloadrpmdrake-73dfb00d48a836b17d2e96909b13c3fd5f18105e.tar
rpmdrake-73dfb00d48a836b17d2e96909b13c3fd5f18105e.tar.gz
rpmdrake-73dfb00d48a836b17d2e96909b13c3fd5f18105e.tar.bz2
rpmdrake-73dfb00d48a836b17d2e96909b13c3fd5f18105e.tar.xz
rpmdrake-73dfb00d48a836b17d2e96909b13c3fd5f18105e.zip
(perform_installation) kill a hack that prevented $_ from being trashed
-rwxr-xr-xrpmdrake3
1 files changed, 1 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 0d27da63..1f4a21bc 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1884,8 +1884,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
unlink $_;
}
- # 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}}];
+ 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;