summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2015-02-15 09:52:03 +0000
committerColin Guthrie <colin@mageia.org>2015-02-15 09:52:42 +0000
commit46ce1e3284d595bd7be1ab41a79ecd67730553e4 (patch)
tree2958551356f26c246b637ca0933cbf59c63ee165
parentadae08ca607e4d08a091af7c1f8419df0b36aa67 (diff)
downloaddrakx-46ce1e3284d595bd7be1ab41a79ecd67730553e4.tar
drakx-46ce1e3284d595bd7be1ab41a79ecd67730553e4.tar.gz
drakx-46ce1e3284d595bd7be1ab41a79ecd67730553e4.tar.bz2
drakx-46ce1e3284d595bd7be1ab41a79ecd67730553e4.tar.xz
drakx-46ce1e3284d595bd7be1ab41a79ecd67730553e4.zip
Fix timezone dir install prefix prepending (broken symlink during installer mga#14888)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/timezone.pm5
3 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index da6d34f19..9f5be2c48 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix timezone dir install prefix prepending (broken symlink during installer mga#14888)
+
Version 16.56 - 10 February 2015
- service_harddrake:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index fd80a4654..033827a36 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1510,7 +1510,7 @@ sub configure_time_more {
require POSIX;
use POSIX qw(strftime);
my $time_format = "%H:%M:%S";
- my $tz_prefix = timezone::get_timezone_prefix();
+ my $tz_prefix = ($::testing ? '' : $::prefix) . timezone::get_timezone_prefix();
local $ENV{TZ} = ':' . $tz_prefix . '/' . $timezone->{timezone};
$in->ask_from_({ interactive_help_id => 'configureTimezoneUTC',
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index ec252c603..4f72f4d58 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -7,12 +7,11 @@ use common;
use log;
sub get_timezone_prefix() {
- my $prefix = $::testing ? '' : $::prefix;
- $prefix . "/usr/share/zoneinfo";
+ "/usr/share/zoneinfo";
}
sub getTimeZones() {
- my $tz_prefix = get_timezone_prefix();
+ my $tz_prefix = ($::testing ? '' : $::prefix) . get_timezone_prefix();
open(my $F, "cd $tz_prefix && find [A-Z]* -noleaf -type f |");
my @l = difference2([ chomp_(<$F>) ], [ 'ROC', 'PRC' ]);
close $F or die "cannot list the available zoneinfos";