summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-24 11:48:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-24 11:48:41 +0000
commit3b50dc3878f716e3a8620ed8dc4beaef00758d8f (patch)
tree5b4388a964d1282ef9d23bfdabaed3d738b6f9fe /perl-install
parent31b4c1ac8cc81d4a8df76fea57c5f12fe9d922b0 (diff)
downloaddrakx-3b50dc3878f716e3a8620ed8dc4beaef00758d8f.tar
drakx-3b50dc3878f716e3a8620ed8dc4beaef00758d8f.tar.gz
drakx-3b50dc3878f716e3a8620ed8dc4beaef00758d8f.tar.bz2
drakx-3b50dc3878f716e3a8620ed8dc4beaef00758d8f.tar.xz
drakx-3b50dc3878f716e3a8620ed8dc4beaef00758d8f.zip
allow neuneus to quit install at license step (esp. for Ann & Warly's father)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 80384370b..740fd4818 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -82,11 +82,16 @@ sub acceptLicense {
my $r = 'Refuse';
$o->ask_from_({ title => N("License agreement"),
+ cancel => N("Quit"),
messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()),
interactive_help_id => 'acceptLicense',
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
- [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]);
+ [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ])
+ or do {
+ install_any::ejectCdrom();
+ $o->exit;
+ };
}
#------------------------------------------------------------------------------