summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-09 23:33:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-09 23:33:17 +0000
commit70445f1b7bc94d9d1f4f095391ab93f1e6de72ee (patch)
tree52ab2ab3b9e668567a3d5a3a780c6c4a2c04f30f
parent4cd590133835c6070396f5c05d26c663d31edf10 (diff)
downloaddrakx-70445f1b7bc94d9d1f4f095391ab93f1e6de72ee.tar
drakx-70445f1b7bc94d9d1f4f095391ab93f1e6de72ee.tar.gz
drakx-70445f1b7bc94d9d1f4f095391ab93f1e6de72ee.tar.bz2
drakx-70445f1b7bc94d9d1f4f095391ab93f1e6de72ee.tar.xz
drakx-70445f1b7bc94d9d1f4f095391ab93f1e6de72ee.zip
(setPackages): use lang::langs instead of using $o->{langs} as a array ref (it is not so anymore)
(spawnShell): print the drakx_version
-rw-r--r--perl-install/install_any.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 29650cb5b..031272073 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -224,6 +224,8 @@ sub spawnShell {
open STDERR, ">&F" or die '';
close F;
+ print any::drakx_version(), "\n";
+
c::setsid();
ioctl(STDIN, c::TIOCSCTTY(), 0) or warn "could not set new controlling tty: $!";
@@ -309,7 +311,7 @@ sub setPackages {
$o->{compssUsersChoice}{SYSTEM} = 1;
$o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}} } @{$o->{compssUsersSorted}};
- foreach (map { substr($_, 0, 2) } @{$o->{langs}}) {
+ foreach (map { substr($_, 0, 2) } lang::langs($o->{langs})) {
push @{$o->{default_packages}}, pkgs::packageByName($o->{packages}, "locales-$_") || next;
$o->{compssUsersChoice}{qq(LOCALES"$_")} = 1;
}