summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-02-21 16:27:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-02-21 16:27:49 +0000
commitabde901ac4e2d5a5645e7ab56d2a2b95d8e732c2 (patch)
treebfd9b8a9ba81ade5a79072a93c9ad04aa5ba88e3
parent61678cefb938c2d27351a4faf58a4ad513f619f5 (diff)
downloaddrakx-abde901ac4e2d5a5645e7ab56d2a2b95d8e732c2.tar
drakx-abde901ac4e2d5a5645e7ab56d2a2b95d8e732c2.tar.gz
drakx-abde901ac4e2d5a5645e7ab56d2a2b95d8e732c2.tar.bz2
drakx-abde901ac4e2d5a5645e7ab56d2a2b95d8e732c2.tar.xz
drakx-abde901ac4e2d5a5645e7ab56d2a2b95d8e732c2.zip
do URPM::add_macro in write_langs(), and require URPM instead of using it
(for now it's only used during install) (bugzilla #13796)
-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 b7becb3d2..0241c6953 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -4,7 +4,6 @@ use diagnostics;
use strict;
use common;
use log;
-use URPM;
#- key: lang name (locale name for some (~5) special cases needing
#- extra distinctions)
@@ -923,7 +922,6 @@ sub utf8_should_be_needed {
sub pack_langs {
my ($l) = @_;
my $s = $l->{all} ? 'all' : join ':', uniq(map { getLANGUAGE($_) } langs($l));
- URPM::add_macro("_install_langs $s");
$s;
}
@@ -961,6 +959,8 @@ sub write_langs {
my ($langs) = @_;
my $s = pack_langs($langs);
symlink "$::prefix/etc/rpm", "/etc/rpm" if $::prefix;
+ require URPM;
+ URPM::add_macro("_install_langs $s");
substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$::prefix/etc/rpm/macros";
}