Mageia Bugzilla – Attachment 5784 Details for
Bug 14888
Qt5 QTimeZone::systemTimeZoneId() returns broken value - timezone set broken installer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch to unlink and symlink new localtime
localtime_link.patch (text/plain), 706 bytes, created by
Angelo Naselli
on 2015-01-04 21:07:08 CET
(
hide
)
Description:
patch to unlink and symlink new localtime
Filename:
MIME Type:
Creator:
Angelo Naselli
Created:
2015-01-04 21:07:08 CET
Size:
706 bytes
patch
obsolete
>diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm >index efd1abd..98a33c3 100644 >--- a/perl-install/timezone.pm >+++ b/perl-install/timezone.pm >@@ -64,8 +64,8 @@ sub write { > set_ntp_server($t->{ntp}); > > my $tz_prefix = get_timezone_prefix(); >- eval { cp_af($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") }; >- $@ and log::l("installing /etc/localtime failed"); >+ unlink "$::prefix/etc/localtime" or log::l("unlinking $! failed"); >+ symlink ($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") or log::l("linking /etc/localtime failed"); > setVarsInSh("$::prefix/etc/sysconfig/clock", { > ZONE => $t->{timezone}, > UTC => bool2text($t->{UTC}),
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index efd1abd..98a33c3 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -64,8 +64,8 @@ sub write { set_ntp_server($t->{ntp}); my $tz_prefix = get_timezone_prefix(); - eval { cp_af($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") }; - $@ and log::l("installing /etc/localtime failed"); + unlink "$::prefix/etc/localtime" or log::l("unlinking $! failed"); + symlink ($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") or log::l("linking /etc/localtime failed"); setVarsInSh("$::prefix/etc/sysconfig/clock", { ZONE => $t->{timezone}, UTC => bool2text($t->{UTC}),
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 14888
: 5784 |
5920