diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2000-05-07 17:07:30 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2000-05-07 17:07:30 +0000 |
commit | 73053fb0bb6255c13deecd198499cfc4479134bc (patch) | |
tree | f5e5e1ae0259613e69c9041f6745ec2f967eff1f /perl-install/install_steps_interactive.pm | |
parent | 6e0714d453adf6cb59f3a8083d3561d5f274be16 (diff) | |
download | drakx-backup-do-not-use-73053fb0bb6255c13deecd198499cfc4479134bc.tar drakx-backup-do-not-use-73053fb0bb6255c13deecd198499cfc4479134bc.tar.gz drakx-backup-do-not-use-73053fb0bb6255c13deecd198499cfc4479134bc.tar.bz2 drakx-backup-do-not-use-73053fb0bb6255c13deecd198499cfc4479134bc.tar.xz drakx-backup-do-not-use-73053fb0bb6255c13deecd198499cfc4479134bc.zip |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r-- | perl-install/install_steps_interactive.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ada8e2c59..97618c1d6 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -275,13 +275,13 @@ sub choosePackages { #- selection of CD by user if using a cdrom. $o->chooseCD($packages) if $o->{method} eq 'cdrom'; - my $available = install_steps::choosePackages(@_); + my $availableC = install_steps::choosePackages(@_); my $individual = $::expert; require pkgs; my $min_size = pkgs::selectedSize($packages); - $min_size < $available or die _("Your system has not enough space left for installation or upgrade"); + $min_size < $availableC or die _("Your system has not enough space left for installation or upgrade"); $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual) unless $::beginner || $::corporate; @@ -292,12 +292,12 @@ sub choosePackages { my $max_size = pkgs::selectedSize($packages); mapn { pkgs::packageSetFlagSelected(@_) } \@l, \@flags; -#- if (!$::beginner && $max_size > $available) { +#- if (!$::beginner && $max_size > $availableC) { #- $o->ask_okcancel('', #-_("You need %dMB for a full install of the groups you selected. #-You can go on anyway, but be warned that you won't get all packages", $max_size / sqr(1024)), 1) or goto &choosePackages #- } - my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, $max_size, $available, $individual) or goto &choosePackages; + my $size2install = $::beginner && $first_time ? $availableC * 0.7 : $o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) or goto &choosePackages; ($o->{packages_}{ind}) = pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass}); @@ -305,8 +305,8 @@ sub choosePackages { } sub chooseSizeToInstall { - my ($o, $packages, $min, $max, $available) = @_; - $available * 0.7; + my ($o, $packages, $min, $max, $availableC) = @_; + $availableC * 0.7; } sub choosePackagesTree {} |