summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-23 13:09:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-23 13:09:22 +0000
commit22a6a8ec579c8108b37bccc44c18342f341cbfb9 (patch)
tree9622b34ee6378b881c3b1a666f876d18ff3d16d8
parent6e0bb1756e368a569a5b054d939da4f3a2911c7b (diff)
downloaddrakx-22a6a8ec579c8108b37bccc44c18342f341cbfb9.tar
drakx-22a6a8ec579c8108b37bccc44c18342f341cbfb9.tar.gz
drakx-22a6a8ec579c8108b37bccc44c18342f341cbfb9.tar.bz2
drakx-22a6a8ec579c8108b37bccc44c18342f341cbfb9.tar.xz
drakx-22a6a8ec579c8108b37bccc44c18342f341cbfb9.zip
fix locale support when usingRamdisk
-rw-r--r--perl-install/lang.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 178671070..37856713d 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -307,14 +307,14 @@ sub set {
#- using a compressed cpio archive is nighmare to extract all files.
#- reset locale environment variable to avoid any warnings by perl,
#- so installation of new locale is done with empty locale ...
- unless (-e "$ENV{SHARE_PATH}/locale/$languages{$lang}[2]") {
+ if (!-e "$ENV{SHARE_PATH}/locale/$lang" && common::usingRamdisk()) {
@ENV{qw(LANG LC_ALL LANGUAGE LINGUAS)} = ();
eval { commands::rm("-r", "$ENV{SHARE_PATH}/locale") };
eval {
require packdrake;
my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2", quiet => 1);
- $packer->extract_archive("$ENV{SHARE_PATH}/locale", "UTF-8", $languages{$lang}[2]);
+ $packer->extract_archive("$ENV{SHARE_PATH}/locale", "UTF-8", split(":", $languages{$lang}[3]));
};
}