summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 16:28:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 16:28:43 +0000
commitfe435d0ab171cf1b928476964526965638123cd2 (patch)
tree6c160715066e7cc84e1c0b1410c749e059fb7e41
parent2a6d5cf8e0a163872f3277b0cb2e75ae786e0c48 (diff)
downloaddrakx-fe435d0ab171cf1b928476964526965638123cd2.tar
drakx-fe435d0ab171cf1b928476964526965638123cd2.tar.gz
drakx-fe435d0ab171cf1b928476964526965638123cd2.tar.bz2
drakx-fe435d0ab171cf1b928476964526965638123cd2.tar.xz
drakx-fe435d0ab171cf1b928476964526965638123cd2.zip
use $::prefix in timezone::read
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/timezone.pm3
2 files changed, 2 insertions, 3 deletions
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}) };
}