diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-04-18 19:53:15 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-04-20 21:35:26 +0100 |
| commit | bf24ef177504839892271171ccef6533bf449263 (patch) | |
| tree | 11b7d96611e4198ecdb4240379335608da509352 | |
| parent | eb19db5ef5d593d238dbe284d52ea20fb371d33b (diff) | |
| download | drakx-bf24ef177504839892271171ccef6533bf449263.tar drakx-bf24ef177504839892271171ccef6533bf449263.tar.gz drakx-bf24ef177504839892271171ccef6533bf449263.tar.bz2 drakx-bf24ef177504839892271171ccef6533bf449263.tar.xz drakx-bf24ef177504839892271171ccef6533bf449263.zip | |
installer: don't automatically change time zone on upgrade (mga#24670)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 01fe86fa0..121317763 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- don't automatically change time zone on upgrade (mga#24670) - partitioning: fix resize of encrypted partitions (mga#22032) Version 18.12 - 16 March 2019 diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 22af7b36d..83f102a10 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -866,7 +866,7 @@ sub summary { $o->pkg_install(map { $_->name } @pkgs) if @pkgs; lang::write_and_install($o->{locale}, $o->do_pkgs); - if (!$timezone_manually_set) { + if (!$timezone_manually_set && !$o->{isUpgrade}) { delete $o->{timezone}; install::any::preConfigureTimezone($o); #- now we can precise the timezone thanks to the country } |