From a833d02bc9adda311081e127b7a2bb125dbdc882 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 12 Dec 2002 21:32:08 +0000
Subject: remove beginner/expert choice

---
 perl-install/install_steps_interactive.pm | 34 ++++---------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f0b150142..2652ea99e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -122,44 +122,18 @@ sub selectKeyboard {
     any::keyboard_group_toggle_choose($o, $o->{keyboard}) or goto &selectKeyboard;
     install_steps::selectKeyboard($o);
 }
-#------------------------------------------------------------------------------
-sub selectInstallClass1 {
-    my ($o, $verif, $l, $def, $l2, $def2) = @_;
-    $verif->($o->ask_from_list(N("Install Class"), N("Which installation class do you want?"), $l, $def) || die 'already displayed');
-
-    return if !@$l2;
-
-    $::live ? 'Update' : $o->ask_from_list_(N("Install/Update"), N("Is this an install or an update?"), $l2, $def2);
-}
 
 #------------------------------------------------------------------------------
 sub selectInstallClass {
     my ($o, $clicked) = @_;
 
-    my %c = my @c = (
-      if_(!$::corporate,
-	N("Recommended") => "beginner",
-      ),
-      if_($o->{meta_class} ne 'desktop',
-	N("Expert")	 => "expert",
-      ),
-    );
-    %c = @c = (N("Expert") => "expert") if $::expert && !$clicked;
-
-    $o->set_help('selectInstallClassCorpo') if $::corporate;
-
-    my $verifInstallClass = sub { $::expert = $c{$_[0]} eq "expert" };
     my $installMode = $o->{isUpgrade} ? $o->{keepConfiguration} ? N_("Upgrade packages only") : N_("Upgrade") : N_("Install");
 
-    if ($installMode = $o->selectInstallClass1($verifInstallClass,
-					       first(list2kv(@c)), ${{ reverse %c }}{$::expert ? "expert" : "beginner"},
-					       exists $o->{isUpgrade} ? [] : [ N_("Install"), N_("Upgrade"), N_("Upgrade packages only") ], $installMode)) {
-	log::l("install class: $installMode");
-	$o->{isUpgrade} = $installMode =~ /Upgrade/;
-	$o->{keepConfiguration} = $installMode =~ /packages only/;
-    }
+    $installMode = exists $o->{isUpgrade} || $::live ? 'Update' : $o->ask_from_list_(N("Install/Update"), N("Is this an install or an update?"), [ N_("Install"), N_("Upgrade"), N_("Upgrade packages only") ], $installMode);
 
-    install_steps::selectInstallClass($o);
+    log::l("install class: $installMode");
+    $o->{isUpgrade} = $installMode =~ /Upgrade/;
+    $o->{keepConfiguration} = $installMode =~ /packages only/;
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1