summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-22 12:59:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-22 12:59:13 +0000
commit4477f2cf41cad3af5668d4c7a04fb61c06cd2b03 (patch)
treea6865eab87ea4d071f79f6011b7c5bac08b6aee2 /perl-install/install_steps_interactive.pm
parenta600d149f05af71115ab119b08ce58c53fd5b626 (diff)
downloaddrakx-backup-do-not-use-4477f2cf41cad3af5668d4c7a04fb61c06cd2b03.tar
drakx-backup-do-not-use-4477f2cf41cad3af5668d4c7a04fb61c06cd2b03.tar.gz
drakx-backup-do-not-use-4477f2cf41cad3af5668d4c7a04fb61c06cd2b03.tar.bz2
drakx-backup-do-not-use-4477f2cf41cad3af5668d4c7a04fb61c06cd2b03.tar.xz
drakx-backup-do-not-use-4477f2cf41cad3af5668d4c7a04fb61c06cd2b03.zip
fix a few cancel's (reported by slegros)
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 527bed9f9..912493870 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -670,7 +670,7 @@ sub chooseGroups {
#- ask user for its choice.
$type = $o->ask_from_list_(_("Type of install"), _("You do not have selected any group of packages
-Please choose the minimal installation you want"), [ __("Base system only"), __("No X"), __("With X"), ], $type);
+Please choose the minimal installation you want"), [ __("Base system only"), __("No X"), __("With X"), ], $type) or return &chooseGroups;
#- reselect according to user selection.
if ($type eq __("Base system only")) {
@@ -952,7 +952,7 @@ sub configureTimezone {
my ($o, $clicked) = @_;
require timezone;
- $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
+ $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) || return;
$o->set_help('configureTimezoneGMT');
my $ntp = to_bool($o->{timezone}{ntp});