summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2015-02-15 12:45:58 +0100
committerAngelo Naselli <anaselli@linux.it>2015-02-15 12:45:58 +0100
commitb26a69c7edbec529be9d325414e8cb47ca132182 (patch)
tree57cbdf38c5633bec19e059b803674e1cdaf966ff
parent46ce1e3284d595bd7be1ab41a79ecd67730553e4 (diff)
downloaddrakx-b26a69c7edbec529be9d325414e8cb47ca132182.tar
drakx-b26a69c7edbec529be9d325414e8cb47ca132182.tar.gz
drakx-b26a69c7edbec529be9d325414e8cb47ca132182.tar.bz2
drakx-b26a69c7edbec529be9d325414e8cb47ca132182.tar.xz
drakx-b26a69c7edbec529be9d325414e8cb47ca132182.zip
Revert "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, 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";