Mageia Bugzilla – Attachment 10949 Details for
Bug 24670
Upgrading M6.0 official to M7 B3 round 3 does not respect current timezone
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Proposed patch
0001-installer-don-t-automatically-change-time-zone-on-up.patch (text/plain), 1.18 KB, created by
Martin Whitaker
on 2019-04-18 21:23:25 CEST
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2019-04-18 21:23:25 CEST
Size:
1.18 KB
patch
obsolete
>From 7e4fed96568100553aaa857981d1472a15f16eaf Mon Sep 17 00:00:00 2001 >From: Martin Whitaker <mageia@martin-whitaker.me.uk> >Date: Thu, 18 Apr 2019 19:53:15 +0100 >Subject: [PATCH] installer: don't automatically change time zone on upgrade > (mga#24670) > > >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 > } >-- >2.21.0 >
From 7e4fed96568100553aaa857981d1472a15f16eaf Mon Sep 17 00:00:00 2001 From: Martin Whitaker <mageia@martin-whitaker.me.uk> Date: Thu, 18 Apr 2019 19:53:15 +0100 Subject: [PATCH] installer: don't automatically change time zone on upgrade (mga#24670) 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 } -- 2.21.0
View Attachment As Raw
Actions:
View
Attachments on
bug 24670
:
10935
|
10936
| 10949