diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-19 10:43:05 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-19 10:43:05 +0000 |
| commit | 10719cfebebf1705ac46b3e3fd6144207ad30f37 (patch) | |
| tree | 94673a3ac349a2bc148e2047631d8ad251ed2430 /perl-install | |
| parent | 067b15d8a9c17223b1ec535531b6c0d9243fd420 (diff) | |
| download | drakx-10719cfebebf1705ac46b3e3fd6144207ad30f37.tar drakx-10719cfebebf1705ac46b3e3fd6144207ad30f37.tar.gz drakx-10719cfebebf1705ac46b3e3fd6144207ad30f37.tar.bz2 drakx-10719cfebebf1705ac46b3e3fd6144207ad30f37.tar.xz drakx-10719cfebebf1705ac46b3e3fd6144207ad30f37.zip | |
do not unconfigure timezone if timezone screen is canceled (#33565)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 83bc734e1..0422279c5 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1335,7 +1335,8 @@ sub configure_timezone { my ($in, $timezone, $ask_gmt) = @_; require timezone; - $timezone->{timezone} = $in->ask_from_treelist(N("Timezone"), N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $timezone->{timezone}) or return; + my $selected_timezone = $in->ask_from_treelist(N("Timezone"), N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $timezone->{timezone}) or return; + $timezone->{timezone} = $selected_timezone; my $ntp = to_bool($timezone->{ntp}); my $servers = timezone::ntp_servers(); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fba0bfb0b..d199a5dc0 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- do not unconfigure timezone if timezone screen is canceled (#33565) + Version 10.16 - 18 March 2008 - adduserdrake: |