diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-12-14 16:42:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-12-14 16:42:45 +0000 |
| commit | ea1c93402dfa2aba19ab3dbc3551cd21572affb9 (patch) | |
| tree | ec45ca3dd1f9c2899748fabe19ef9f4a2d1ba13d /perl-install/install_steps_interactive.pm | |
| parent | 0f4c7b1bab30307ecee99c03506b0bb632e5c51f (diff) | |
| download | drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.gz drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.bz2 drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.xz drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 186fcddcd..6abd2a9ee 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -423,7 +423,10 @@ sub installCrypto { ") || return; require crypto; - $u->{mirror} = crypto::text2mirror($o->ask_from_list('', _("Choose a mirror from which to get the packages"), [ crypto::mirrorstext() ], crypto::mirror2text($u->{mirror}))); + eval { + $u->{mirror} = crypto::text2mirror($o->ask_from_list('', _("Choose a mirror from which to get the packages"), [ crypto::mirrorstext() ], crypto::mirror2text($u->{mirror}))); + }; + return if $@; my @packages = do { my $w = $o->wait_message('', _("Contacting the mirror to get the list of available packages")); @@ -443,7 +446,7 @@ sub timeConfig { require timezone; $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang})); $o->{timezone}{timezone} = $o->ask_from_list('', _("Which is your timezone?"), [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}); - $o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT}) if $::expert || $clicked; + $o->{timezone}{UTC} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{UTC}) if $::expert || $clicked; install_steps::timeConfig($o,$f); } |