ensure licence step is asked in any case (ie. even when selectLanguage is automatic)

3 files changed, 7 insertions, 0 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 19abc9b81..afc81bdd8 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -89,6 +89,8 @@ sub selectLanguage {
     my ($clicked, $ent_number, $auto) = @_;
 
     installStepsCall($o, $auto, 'selectLanguage', $ent_number == 1);
+
+    $o->acceptLicence;
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0ecf0817e..a43b374fe 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -116,6 +116,7 @@ sub selectKeyboard {
     } 'installPackages' unless $::g_auto_install;
 }
 #------------------------------------------------------------------------------
+sub acceptLicence {}
 sub selectPath {}
 #------------------------------------------------------------------------------
 sub selectInstallClass {}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index bf1c3c466..9788ef93b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -103,6 +103,8 @@ varies from language to language).")) if $o->{lang} !~ /^en/ && !lang::load_mo()
 so the messages will be displayed in english during installation") if $ENV{LANGUAGE} eq 'C';
     }
     
+sub acceptLicence {
+    my ($o) = @_;
     unless ($o->{useless_thing_accepted}) {
 	$o->set_help('license');
 	$o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX(
@@ -185,6 +187,8 @@ For any question on this document, please contact MandrakeSoft S.A.
 ")), [ __("Accept"), __("Refuse") ], "Refuse") eq "Accept" or $o->exit;
     }
 }
+}
+
 #------------------------------------------------------------------------------
 sub selectKeyboard {
     my ($o, $clicked) = @_;