Attachment 5920 Details for Bug 14888 – possible patch

[patch] possible patch

tz.patch (text/plain), 805 bytes, created by Angelo Naselli on 2015-02-15 11:41:02 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Angelo Naselli

Created: 2015-02-15 11:41:02 CET

Size: 805 bytes

patch

obsolete

diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index ec252c6..5593577 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -7,7 +7,8 @@ use common;
 use log;
 
 sub get_timezone_prefix() {
-    my $prefix = $::testing ? '' : $::prefix;
+    my $system_prefix = shift;
+    my $prefix = ($::testing || $system_prefix) ? '' : $::prefix;
     $prefix . "/usr/share/zoneinfo";
 }
 
@@ -63,7 +64,8 @@ sub write {
 
     set_ntp_server($t->{ntp});
 
-    my $tz_prefix = get_timezone_prefix();
+    my $system_prefix = 1;
+    my $tz_prefix = get_timezone_prefix($system_prefix);
     eval { symlinkf($tz_prefix . '/' . $t->{timezone}, "$::prefix/etc/localtime") };
     $@ and log::l("installing /etc/localtime failed");
     setVarsInSh("$::prefix/etc/sysconfig/clock", {

Actions: View | Diff

Attachments on bug 14888: 5784 | 5920