aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/pkg.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-20 17:26:39 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-20 17:26:39 +0000
commitaccf24e4ff43d8b5e8affcf79a516b29e4c1b7fd (patch)
tree74f6103947e992c3e6844b2b0637fd089846efa9 /Rpmdrake/pkg.pm
parent0b1b14305116346bf071ba8a1382e9f4ba4be867 (diff)
downloadrpmdrake-accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd.tar
rpmdrake-accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd.tar.gz
rpmdrake-accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd.tar.bz2
rpmdrake-accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd.tar.xz
rpmdrake-accf24e4ff43d8b5e8affcf79a516b29e4c1b7fd.zip
(closure_removal, perform_installation) revert a change that introduced a
regression in MandrivaUpdate (no more selecting updates)
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rw-r--r--Rpmdrake/pkg.pm4
1 files changed, 2 insertions, 2 deletions
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}} },