aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/gui.pm2
-rw-r--r--Rpmdrake/pkg.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 43e2ba74..39726352 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -827,7 +827,7 @@ sub toggle_nodes {
}
if (my @cant = sort(difference2(\@nodes, \@nodes_with_deps))) {
- my @ask_unselect = urpm::select::unselected_packages($urpm, $urpm->{state});
+ my @ask_unselect = urpm::select::unselected_packages($urpm->{state});
my @reasons = map {
my $cant = $_;
my $unsel = find { $_ eq $cant } @ask_unselect;
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index c8073d09..4a21b538 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -708,7 +708,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my @to_install = @{$urpm->{depslist}}[keys %{$state->{selected}}];
my @pkgs = map { scalar($_->fullname) } sort(grep { $_->flag_selected } @to_install);
- @{$urpm->{ask_remove}} = sort(urpm::select::removed_packages($urpm, $urpm->{state}));
+ @{$urpm->{ask_remove}} = sort(urpm::select::removed_packages($urpm->{state}));
my @to_remove = map { if_($pkgs->{$_}{selected} && !$pkgs->{$_}{pkg}->flag_upgrade, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
my $r = format_list(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @to_remove);
@@ -774,7 +774,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
};
# FIXME: sometimes state is lost:
- my @ask_unselect = urpm::select::unselected_packages($urpm, $state);
+ my @ask_unselect = urpm::select::unselected_packages($state);
# fix flags for orphan computing:
foreach (keys %{$state->{selected}}) {
@@ -782,7 +782,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
$pkg->set_flag_requested($saved_flags{$pkg->id});
}
my $exit_code =
- urpm::main_loop::run($urpm, $state, 1, \@ask_unselect, $requested,
+ urpm::main_loop::run($urpm, $state, 1, \@ask_unselect,
{
completed => sub {
# explicitly destroy the progress window when it's over; we may