From 9887fe04751edf39e8389f2c3ec3f020b5e1c17d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 4 Jan 2001 19:34:30 +0000
Subject: keep $o->{langs} unpacked to simplify things

---
 perl-install/lang.pm | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'perl-install/lang.pm')

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ebea1a86a..a282c444a 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -302,28 +302,11 @@ sub pack_langs {
       join ':', uniq(map { $languages{$_}[3] } @$l);
 }
 
-sub unpack_langs {
-    my ($langs) = @_;
-    [ 
-     $langs eq 'all' ?
-     map { $_->[2] } values %languages :
-     split(':', $langs)
-    ];
-}
-
-sub unpack_lang_codes {
-    my ($langs) = @_;
-    [ 
-     $langs eq 'all' ?
-     map { substr($_->[2], 0, 2) } values %languages :
-     split(':', $langs)
-    ];
-}
-
 sub write_langs {
     my ($prefix, $langs) = @_;
+    my $s = pack_langs($langs);
     symlink "$prefix/etc/rpm", "/etc/rpm" if $prefix;
-    substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $langs\n" if eof } "$prefix/etc/rpm/macros";
+    substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof } "$prefix/etc/rpm/macros";
 }
 
 sub write { 
-- 
cgit v1.2.1