From 1c131849956ed81b1eebff595d7427783560a5ab Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 6 Sep 2004 11:29:04 +0000
Subject: drop lang::write()'s prefix parameter in favor of $::prefix (which
 was already partially done)

---
 perl-install/install_steps.pm             |  2 +-
 perl-install/install_steps_interactive.pm |  2 +-
 perl-install/lang.pm                      | 14 +++++++-------
 perl-install/standalone/localedrake       |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 258c852c7..e143d53c5 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -129,7 +129,7 @@ sub selectLanguage {
 	lang::write_langs($o->{locale}{langs});
     } 'formatPartitions';
     addToBeDone {
-	lang::write($o->{prefix}, $o->{locale});
+	lang::write($o->{locale});
     } 'installPackages';
 }
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index fb1ee8c07..4a0cf1d76 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -924,7 +924,7 @@ sub summary {
 	    my @pkgs = pkgs::packagesProviding($o->{packages}, "locales-$pkg_locale");
 	    $o->pkg_install(map { $_->name } @pkgs) if @pkgs;
 
-	    lang::write($o->{prefix}, $o->{locale});
+	    lang::write($o->{locale});
 	    if (!$timezone_manually_set) {
 		delete $o->{timezone};
 		install_any::preConfigureTimezone($o); #- now we can precise the timezone thanks to the country
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 765a8fa3b..8f4c04cc5 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -985,7 +985,7 @@ sub i18n_env {
 }
 
 sub write { 
-    my ($prefix, $locale, $b_user_only, $b_dont_touch_kde_files) = @_;
+    my ($locale, $b_user_only, $b_dont_touch_kde_files) = @_;
 
     $locale && $locale->{lang} or return;
 
@@ -993,13 +993,13 @@ sub write {
 
     my ($name, $sfm, $acm) = l2console_font($locale, 0);
     if ($name && !$b_user_only) {
-	my $p = "$prefix/usr/lib/kbd";
+	my $p = "$::prefix/usr/lib/kbd";
 	if ($name) {
 	    eval {
 		log::explanations(qq(Set system font to "$name"));
 		my $font = "$p/consolefonts/$name.psf";
 		$font .= ".gz" if ! -e $font;
-		cp_af($font, "$prefix/etc/sysconfig/console/consolefonts");
+		cp_af($font, "$::prefix/etc/sysconfig/console/consolefonts");
 		add2hash $h, { SYSFONT => $name };
 	    };
 	    $@ and log::explanations("missing console font $name");
@@ -1007,7 +1007,7 @@ sub write {
 	if ($sfm) {
 	    eval {
 		log::explanations(qq(Set screen font map (Unicode mapping table) to "$name"));
-		cp_af(glob_("$p/consoletrans/$sfm*"), "$prefix/etc/sysconfig/console/consoletrans");
+		cp_af(glob_("$p/consoletrans/$sfm*"), "$::prefix/etc/sysconfig/console/consoletrans");
 		add2hash $h, { UNIMAP => $sfm };
 	    };
 	    $@ and log::explanations("missing console unimap file $sfm");
@@ -1015,7 +1015,7 @@ sub write {
 	if ($acm) {
 	    eval {
 		log::explanations(qq(Set application-charset map (Unicode mapping table) to "$name"));
-		cp_af(glob_("$p/consoletrans/$acm*"), "$prefix/etc/sysconfig/console/consoletrans");
+		cp_af(glob_("$p/consoletrans/$acm*"), "$::prefix/etc/sysconfig/console/consoletrans");
 		add2hash $h, { SYSFONTACM => $acm };
 	    };
 	    $@ and log::explanations("missing console acm file $acm");
@@ -1055,7 +1055,7 @@ sub write {
 
     my $file = $b_user_only ? "$ENV{HOME}/.i18n" : '/etc/sysconfig/i18n';
     log::explanations(qq(Setting l10n configuration in "$file"));
-    setVarsInSh($prefix . $file, $h);
+    setVarsInSh($::prefix . $file, $h);
 
     if (!$b_user_only) {
         log::explanations("Set default menu language");
@@ -1065,7 +1065,7 @@ sub write {
     }
 
     eval {
-	my $confdir = $prefix . ($b_user_only ? "$ENV{HOME}/.kde" : '/usr') . '/share/config';
+	my $confdir = $::prefix . ($b_user_only ? "$ENV{HOME}/.kde" : '/usr') . '/share/config';
 
 	-d $confdir or die 'not configuring kde config files since it is not installed/used';
 
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index 2f1b22837..246499c32 100644
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -24,7 +24,7 @@ if (defined $klang) {
     my $locale = lang::read($>);
     $klang and $locale->{lang} = $lang;
     $kcountry and $locale->{country} = $country;
-    lang::write('', $locale, $>, 'dont_touch_kde_files') if $apply;
+    lang::write($locale, $>, 'dont_touch_kde_files') if $apply;
 
     #- help KDE defaulting to the right charset
     print lang::charset2kde_charset(lang::l2charset($lang)), "\n";
@@ -59,7 +59,7 @@ if ($@) {
     }
 }
 
-lang::write('', $locale, $>);
+lang::write($locale, $>);
 if ($>) {
     if (my $wm = any::running_window_manager()) {
 	$in->ask_okcancel('', N("The change is done, but to be effective you must logout"), 1)
-- 
cgit v1.2.1