summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-30 23:37:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-30 23:37:55 +0000
commitbee063d9df87e71367e9b4ed98668a111b9ec62f (patch)
tree089381c6d824cf00e91a828151da5940c85ad902
parent75bcbea29b0dba1954344cc78b9ecb75e5007bfa (diff)
downloaddrakx-bee063d9df87e71367e9b4ed98668a111b9ec62f.tar
drakx-bee063d9df87e71367e9b4ed98668a111b9ec62f.tar.gz
drakx-bee063d9df87e71367e9b4ed98668a111b9ec62f.tar.bz2
drakx-bee063d9df87e71367e9b4ed98668a111b9ec62f.tar.xz
drakx-bee063d9df87e71367e9b4ed98668a111b9ec62f.zip
no_comment
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 7d572505f..8aa06986e 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -414,7 +414,7 @@ sub choosePackagesTree {
my ($root, $leaf);
foreach (sort keys %{$packages->[0]}) {
- $add_node->($_, 'all')->hide;
+ $add_node->($_, 'all');
}
foreach (sort @$compss) {
($root, $leaf) = m|(.*)/(.+)|o or ($root, $leaf) = ('', $_);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 007e6f378..9ec17e7eb 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -267,17 +267,17 @@ sub choosePackages {
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $::expert ? 90 : 80, $available, $o->{installClass});
my $min_size = pkgs::selectedSize($packages);
-# $o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
+ $o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
my $max_size = int (sum map { pkgs::packageSize($_) } values %{$packages->[0]});
- if (0 && !$::beginner && $max_size > $available) {
+ if (!$::beginner && $max_size > $available) {
$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 = 1 || $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
+ my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
($o->{packages_}{ind}) =
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, $size2install, $o->{installClass});