From fe435d0ab171cf1b928476964526965638123cd2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Aug 2002 16:28:43 +0000
Subject: use $::prefix in timezone::read

---
 perl-install/install_any.pm | 2 +-
 perl-install/timezone.pm    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index dd4441794..215f9f382 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -291,7 +291,7 @@ sub preConfigureTimezone {
     require timezone;
    
     #- can't be done in install cuz' timeconfig %post creates funny things
-    add2hash($o->{timezone}, timezone::read($o->{prefix})) if $o->{isUpgrade};
+    add2hash($o->{timezone}, timezone::read()) if $o->{isUpgrade};
 
     $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
 
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 3eb4fafe8..ad79cdb6b 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -18,8 +18,7 @@ sub getTimeZones {
 }
 
 sub read {
-    my ($prefix) = @_;
-    my %t = getVarsFromSh("$prefix/etc/sysconfig/clock") or return {};
+    my %t = getVarsFromSh("$::prefix/etc/sysconfig/clock") or return {};
     { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) };
 }
 
-- 
cgit v1.2.1