summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-31 14:35:00 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-31 14:35:00 +0000
commit57a4b035463f058fc861b964970618d1b2938096 (patch)
tree887f1f19029ef0e9649b2fb81512aa6c09e3fe7d
parentcc8e40b49a8b0691f449e630f9b246707918f127 (diff)
downloaddrakiso-57a4b035463f058fc861b964970618d1b2938096.tar
drakiso-57a4b035463f058fc861b964970618d1b2938096.tar.gz
drakiso-57a4b035463f058fc861b964970618d1b2938096.tar.bz2
drakiso-57a4b035463f058fc861b964970618d1b2938096.tar.xz
drakiso-57a4b035463f058fc861b964970618d1b2938096.zip
extract get_langs function
-rwxr-xr-xdraklive10
1 files changed, 9 insertions, 1 deletions
diff --git a/draklive b/draklive
index 3612147..e6aa20a 100755
--- a/draklive
+++ b/draklive
@@ -689,6 +689,14 @@ sub build_grub_cfg {
);
}
+sub get_langs {
+ my ($live) = @_;
+ uniq(
+ (ref $live->{regions} ? @{$live->{regions}{$live->{settings}{region}}} : ()),
+ @{$live->{system}{langs_always}}
+ );
+}
+
sub install_system {
my ($live) = @_;
@@ -705,7 +713,7 @@ sub install_system {
}
local %ENV = (%ENV, %{$live->{system}{install_env}});
- $ENV{DRAKLIVE_LANGS} = join(':', uniq((ref $live->{regions} ? @{$live->{regions}{$live->{settings}{region}}} : ()), @{$live->{system}{langs_always}}));
+ $ENV{DRAKLIVE_LANGS} = join(':', get_langs($live));
$ENV{DRAKLIVE_REGION} = $live->{settings}{region};
run_({ setarch => $live->{settings}{arch} },
'perl', $drakx_in_chroot,