aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-08 14:49:14 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-08 14:49:14 +0000
commit44a922eb7ff4daa9ec3075655a752b6258fa4270 (patch)
tree802827fdabc93a3b104cb2d3278e93aab18dd3f8
parent9e515b5b9169f082fb2174e41c32f151fe27b1d0 (diff)
downloadrpmdrake-44a922eb7ff4daa9ec3075655a752b6258fa4270.tar
rpmdrake-44a922eb7ff4daa9ec3075655a752b6258fa4270.tar.gz
rpmdrake-44a922eb7ff4daa9ec3075655a752b6258fa4270.tar.bz2
rpmdrake-44a922eb7ff4daa9ec3075655a752b6258fa4270.tar.xz
rpmdrake-44a922eb7ff4daa9ec3075655a752b6258fa4270.zip
Adapt code to the new syntax of extract_packages_to_install in upcoming urpmi 4.8.4
-rwxr-xr-xrpmdrake6
1 files changed, 4 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 493fe2e4..3ecff826 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1330,14 +1330,16 @@ Then, restart %s.", $rpmdrake::myname_update)), myexit(-1);
$urpm->compute_installed_flags(db()) unless $updates;
my $requested = {};
+ my $state = {};
$urpm->request_packages_to_upgrade(
db(),
- {}, #- $state,
+ $state,
$requested,
start => 0,
end => $#{$urpm->{depslist}},
);
$urpm->{depslist}[$_]->set_flag_installed foreach keys %$requested; #- pretend it's installed
+ $urpm->{rpmdrake_state} = $state; #- Don't forget it
my %pkg_sel = map { $_ => 1 } @{$options{'pkg-sel'} || []};
my %pkg_nosel = map { $_ => 1 } @{$options{'pkg-nosel'} || []};
@@ -1573,7 +1575,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
$canceled and goto return_with_error;
gurpm::invalidate_cancel_forever();
- my %sources_install = %{$urpm->extract_packages_to_install(\%sources) || {}};
+ my %sources_install = %{$urpm->extract_packages_to_install(\%sources, $urpm->{rpmdrake_state}) || {}};
my @rpms_install = grep { !/\.src\.rpm$/ } values %sources_install;
my @rpms_upgrade = grep { !/\.src\.rpm$/ } values %sources;