From accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 20 Sep 2007 17:26:39 +0000 Subject: (closure_removal, perform_installation) revert a change that introduced a regression in MandrivaUpdate (no more selecting updates) --- Rpmdrake/gui.pm | 1 + Rpmdrake/pkg.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'Rpmdrake') diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 1d8cca6e..fe6d7cee 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -455,6 +455,7 @@ sub pkgs_provider { } sub closure_removal { + $urpm->{state} = {}; urpm::select::find_packages_to_remove($urpm, $urpm->{state}, \@_); } diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index c616483f..a8aa259a 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -353,7 +353,7 @@ sub get_pkgs { $urpm->compute_installed_flags($db); # TODO/FIXME: not for updates $urpm->{depslist}[$_]->set_flag_installed foreach keys %$requested; #- pretend it's installed } - $urpm->{state} = $state; #- Don't forget it + $urpm->{rpmdrake_state} = $state; #- Don't forget it $gurpm->progress($level = 0.7); my @search_medias = grep { $_->{searchmedia} } @{$urpm->{media}}; @@ -509,7 +509,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my $lock = urpm::lock::urpmi_db($urpm); my $rpm_lock = urpm::lock::rpm_db($urpm, 'exclusive'); - my $state = $probe_only_for_updates ? { } : $urpm->{state}; + my $state = $probe_only_for_updates ? { } : $urpm->{rpmdrake_state}; # select packages to install: $urpm->resolve_requested(open_rpm_db(), $state, { map { $_->id => undef } grep { $_->flag_selected } @{$urpm->{depslist}} }, -- cgit v1.2.1