summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-23 17:41:52 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-23 17:41:52 +0000
commita24473491c447310f049eec13e8b7e3cb06a6963 (patch)
tree66b9923912a8a16df9149bcc95b5355eece12d91 /perl-install
parent5246ab3073fb332231747801be0eaadb39fc5efe (diff)
downloaddrakx-a24473491c447310f049eec13e8b7e3cb06a6963.tar
drakx-a24473491c447310f049eec13e8b7e3cb06a6963.tar.gz
drakx-a24473491c447310f049eec13e8b7e3cb06a6963.tar.bz2
drakx-a24473491c447310f049eec13e8b7e3cb06a6963.tar.xz
drakx-a24473491c447310f049eec13e8b7e3cb06a6963.zip
explicitely pass max rate when computing available size corrected (not to depend on o->{compssListLevel} that currently defaults to max rate)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/steps.pm6
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index f24c8e945..ecf0c2629 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -262,7 +262,7 @@ sub ask_change_cd {
sub selectSupplMedia { '' }
sub choosePackages {
- my ($o) = @_;
+ my ($o, $o_compssListLevel) = @_;
#- now for upgrade, package that must be upgraded are
#- selected first, after is used the same scheme as install.
@@ -274,8 +274,8 @@ sub choosePackages {
log::l(sprintf "available size %s (corrected %s)", formatXiB($available), formatXiB($availableCorrected));
#- !! destroying user selection of packages (they may have done individual selection before)
- exists $o->{compssListLevel}
- and install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $o->{compssListLevel}, $availableCorrected);
+ exists $o->{compssListLevel} || defined $o_compssListLevel
+ and install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $o_compssListLevel || $o->{compssListLevel}, $availableCorrected);
$availableCorrected;
}
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index f0fa33c2c..d5e8b5f65 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -398,7 +398,7 @@ sub choosePackages {
my ($o) = @_;
my $w = $o->wait_message('', N("Looking for available packages..."));
- my $availableC = &install::steps::choosePackages;
+ my $availableC = install::steps::choosePackages($o, $pkgs::rpmsrate_rate_max);
require install::pkgs;