summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-04-09 09:38:20 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-04-09 09:38:20 +0000
commit96d5556deb8427ec2e2dd183c99e80f430043d49 (patch)
treed743ae3ca82c7e7378f36130a902cd39f621baf6
parentaec5ff9f9ad681ee808ee3cc142ee57ac799a5ff (diff)
downloaddrakx-96d5556deb8427ec2e2dd183c99e80f430043d49.tar
drakx-96d5556deb8427ec2e2dd183c99e80f430043d49.tar.gz
drakx-96d5556deb8427ec2e2dd183c99e80f430043d49.tar.bz2
drakx-96d5556deb8427ec2e2dd183c99e80f430043d49.tar.xz
drakx-96d5556deb8427ec2e2dd183c99e80f430043d49.zip
(lang::write_langs) drop prefix parameter
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/lang.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 23df4874b..70cec9202 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -124,7 +124,7 @@ sub selectLanguage {
$o->charsetChanged;
addToBeDone {
- lang::write_langs($o->{prefix}, $o->{locale}{langs});
+ lang::write_langs($o->{locale}{langs});
} 'formatPartitions';
addToBeDone {
lang::write($o->{prefix}, $o->{locale});
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 8002255af..22d78b5ad 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -904,10 +904,10 @@ sub read {
}
sub write_langs {
- my ($prefix, $langs) = @_;
+ my ($langs) = @_;
my $s = pack_langs($langs);
- symlink "$prefix/etc/rpm", "/etc/rpm" if $prefix;
- substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$prefix/etc/rpm/macros";
+ symlink "$::prefix/etc/rpm", "/etc/rpm" if $::prefix;
+ substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$::prefix/etc/rpm/macros";
}
sub i18n_env {