summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-06-26 12:25:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-06-26 12:25:36 +0000
commitd0689bd004ef41eaa3156b1d15de10ca933962ac (patch)
tree5b22f1c304ef62ad2bed1f76f1d7573435412118
parent6e20688d9e3a7105f1af7f291b095f7fe9c10a01 (diff)
downloaddrakx-d0689bd004ef41eaa3156b1d15de10ca933962ac.tar
drakx-d0689bd004ef41eaa3156b1d15de10ca933962ac.tar.gz
drakx-d0689bd004ef41eaa3156b1d15de10ca933962ac.tar.bz2
drakx-d0689bd004ef41eaa3156b1d15de10ca933962ac.tar.xz
drakx-d0689bd004ef41eaa3156b1d15de10ca933962ac.zip
ensure licence step is asked in any case (ie. even when selectLanguage is automatic)
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps.pm1
-rw-r--r--perl-install/install_steps_interactive.pm4
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) = @_;