diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-25 12:14:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-25 12:14:43 +0000 |
| commit | c32e8253a38d505fa0ad1802b9062b2ed96acbab (patch) | |
| tree | 061678d3f23a127768fdf46c6023090e9d568df6 | |
| parent | f26262de85224f5fb42f994b325a96e1ad90dbac (diff) | |
| download | drakx-backup-do-not-use-c32e8253a38d505fa0ad1802b9062b2ed96acbab.tar drakx-backup-do-not-use-c32e8253a38d505fa0ad1802b9062b2ed96acbab.tar.gz drakx-backup-do-not-use-c32e8253a38d505fa0ad1802b9062b2ed96acbab.tar.bz2 drakx-backup-do-not-use-c32e8253a38d505fa0ad1802b9062b2ed96acbab.tar.xz drakx-backup-do-not-use-c32e8253a38d505fa0ad1802b9062b2ed96acbab.zip | |
no_comment
| -rw-r--r-- | perl-install/ChangeLog | 7 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index e2ecc7669..523967e70 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,10 @@ +2000-04-25 Pixel <pixel@mandrakesoft.com> + + * pkgs.pm (setSelectedFromCompssList): remove the hack for min + mark 25 in beginner + * install_steps_interactive.pm (choosePackages): set $min_mark to + 25 in beginner + 2000-04-24 Pixel <pixel@mandrakesoft.com> * install_steps_interactive.pm (setupXfree): add a yesorno diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index aca54a4cb..dad9f29f7 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -278,7 +278,7 @@ sub choosePackages { $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual) unless $::beginner || $::corporate; - my $min_mark = 1; + my $min_mark = $::beginner ? 25 : 1; my @l = values %{$packages->[0]}; my @flags = map { pkgs::packageFlagSelected($_) } @l; pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass}); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 7b273e5b7..5357c92e5 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -589,8 +589,6 @@ sub setSelectedFromCompssList { my @values = map { $_->{values}[$ind] + (packageFlagUnskip($_) && packageName($_) !~ /^k/ ? 10 : 0) } @packages; sort { $values[$b] <=> $values[$a] } 0 .. $#packages; }; - #- select at least 25 for beginner installation. - $min_level < 25 && $::beginner and $min_level = 25; foreach (@places) { my $p = $packages[$_]; next if packageFlagSkip($p); |