diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-04-18 21:18:30 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-04-20 21:35:26 +0100 |
| commit | ac55dea6ae6cb38633631b18c74c76f452763cfd (patch) | |
| tree | b9f07dea1a8af56cb91481403b82777e551624d6 | |
| parent | 874e4658236fa8f13581ca46999f7a11d7e7a667 (diff) | |
| download | drakx-ac55dea6ae6cb38633631b18c74c76f452763cfd.tar drakx-ac55dea6ae6cb38633631b18c74c76f452763cfd.tar.gz drakx-ac55dea6ae6cb38633631b18c74c76f452763cfd.tar.bz2 drakx-ac55dea6ae6cb38633631b18c74c76f452763cfd.tar.xz drakx-ac55dea6ae6cb38633631b18c74c76f452763cfd.zip | |
installer: preserve existing locale settings on upgrade (mga#24671)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c7151e368..657bf0ab7 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- preserve existing locale settings on upgrade (mga#24671) - store country code in /etc/locale.conf (mga#24671) - don't automatically change time zone on upgrade (mga#24670) - partitioning: fix resize of encrypted partitions (mga#22032) diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 5dd31bf62..285feb8a9 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -126,7 +126,13 @@ sub selectLanguage { $o->charsetChanged; addToBeDone { - lang::write_langs($o->{locale}{langs}); + if ($o->{isUpgrade}) { + #- preserve existing locale settings (mga#24671) + $o->{locale} = lang::read(); + $o->{locale}{langs}{$o->{locale}{lang}} = 1; + } else { + lang::write_langs($o->{locale}{langs}); + } } 'formatPartitions'; addToBeDone { lang::write_and_install($o->{locale}, $o->do_pkgs); |