From b26a69c7edbec529be9d325414e8cb47ca132182 Mon Sep 17 00:00:00 2001
From: Angelo Naselli <anaselli@linux.it>
Date: Sun, 15 Feb 2015 12:45:58 +0100
Subject: Revert "Fix timezone dir install prefix prepending (broken symlink
 during installer mga#14888)"

This reverts commit 46ce1e3284d595bd7be1ab41a79ecd67730553e4.
---
 perl-install/NEWS        | 2 --
 perl-install/any.pm      | 2 +-
 perl-install/timezone.pm | 5 +++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9f5be2c48..da6d34f19 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,3 @@
-- 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 033827a36..fd80a4654 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 = ($::testing ? '' : $::prefix) . timezone::get_timezone_prefix();
+    my $tz_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 4f72f4d58..ec252c603 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -7,11 +7,12 @@ use common;
 use log;
 
 sub get_timezone_prefix() {
-    "/usr/share/zoneinfo";
+    my $prefix = $::testing ? '' : $::prefix;
+    $prefix . "/usr/share/zoneinfo";
 }
 
 sub getTimeZones() {
-    my $tz_prefix = ($::testing ? '' : $::prefix) . get_timezone_prefix();
+    my $tz_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";
-- 
cgit v1.2.1