summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-08 13:03:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-08 13:03:54 +0000
commit40a6a32029a53cba2bca40397f260928c3f3f806 (patch)
tree2a88b725020804e7560d4a02d426157dd1761eac /perl-install
parent1d6487565219482153602db10442b828dba87447 (diff)
downloaddrakx-backup-do-not-use-40a6a32029a53cba2bca40397f260928c3f3f806.tar
drakx-backup-do-not-use-40a6a32029a53cba2bca40397f260928c3f3f806.tar.gz
drakx-backup-do-not-use-40a6a32029a53cba2bca40397f260928c3f3f806.tar.bz2
drakx-backup-do-not-use-40a6a32029a53cba2bca40397f260928c3f3f806.tar.xz
drakx-backup-do-not-use-40a6a32029a53cba2bca40397f260928c3f3f806.zip
in case the licence is refused, ask for confirmation
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a82697b80..fec3d6502 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -102,12 +102,14 @@ varies from language to language).")) if $o->{lang} !~ /^en/ && !lang::load_mo()
$o->ask_warn('', "The characters of your language can't be displayed in console,
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(
+ return if $o->{useless_thing_accepted};
+
+ $o->set_help('license');
+ $o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX(
_("Introduction
The operating system and the different components available in the Mandrake Linux distribution
@@ -184,9 +186,11 @@ The terms and conditions of this License are governed by the Laws of France.
All disputes on the terms of this license will preferably be settled out of court. As a last
resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
For any question on this document, please contact MandrakeSoft S.A.
-")), [ __("Accept"), __("Refuse") ], "Refuse") eq "Accept" or $o->exit;
- }
-}
+")), [ __("Accept"), __("Refuse") ], "Refuse") eq "Accept" and return;
+
+ $o->ask_yesorno('', _("Are you sure you refuse the licence?"), 1) and $o->exit;
+
+ &acceptLicence;
}
#------------------------------------------------------------------------------