no_comment

6 files changed, 36 insertions, 8 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index c2db0ff4e..ed450c4b5 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-19  Pixel  <pixel@mandrakesoft.com>
+
+	* modules.pm (get_pcmcia_devices): fix (especially, now ethernet
+	should be detected)
+
+	* lang.pm (get_langs): created, gives rpm install langs
+	* install_any.pm (setPackages): give langs::get_langs() to
+	readCompssList	
+	* pkgs.pm (readCompssList): don't use RPM_INSTALL_LANG, use given
+	$langs instead. This fixes the RPM_INSTALL_LANG=all install.
+
 2000-09-19  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* netconnect.pm: make dhcp-client, pump and such not translatable.
@@ -9,6 +20,10 @@
 	* Xconfigurator.pm (autologin): corrected @users definition and
 	passwd cat.
 
+2000-09-19  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
 2000-09-19  Pixel  <pixel@mandrakesoft.com>
 
 	* many files: changed some access to get_root to get_root_	
@@ -31,8 +46,8 @@
 
 2000-09-19  Pixel  <pixel@mandrakesoft.com>
 
-	* install2.pm (miscellaneous): renamed LITTLE_FRIED_OIGNONS by
-	META_CLASS	
+	* install2.pm (miscellaneous): replaced LITTLE_FRIED_OIGNONS by
+	META_CLASS
 
 	* Xconfigurator.pm (cardConfiguration): when ddcxinfos gives false
 	result (not enough VideoRam), also remove the found resolutions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4d3a78092..9677f38af 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -520,6 +520,7 @@ sub main {
 	    kickstart => sub { $::auto_install = $v },
 	    auto_install => sub { $::auto_install = $v },
 	    simple_themes => sub { $o->{simple_themes} = 1 },
+	    useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
 	    alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    fdisk => sub { $o->{partitioning}{fdisk} = 1 },
 	    g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 749bb40ab..e0f3475cd 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -303,7 +303,7 @@ sub setPackages($) {
 
 	$o->{compss} = pkgs::readCompss($o->{prefix}, $o->{packages});
 	#- must be done after getProvides
-	$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
+	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, lang::get_langs());
 	($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss});
 
 	my @l = ();
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 6b5498025..9f250bcdf 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -283,6 +283,14 @@ sub set_langs {
     log::l("RPM_INSTALL_LANG: $ENV{RPM_INSTALL_LANG}");
 }
 
+sub get_langs {
+    [ 
+     $ENV{RPM_INSTALL_LANG} eq 'all' ?
+     map { substr($_->[2], 0, 2) } values %languages :
+     split(':', $ENV{RPM_INSTALL_LANG})
+    ];
+}
+
 sub write { 
     my ($prefix) = @_;
     my $lang = $ENV{LC_ALL};
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 9a591cbf7..0cb526b7e 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -636,9 +636,12 @@ sub get_pcmcia_devices {
     my (@devs, $desc);
 
     foreach (cat_("/var/run/stab")) {
-	$desc = $1 if /^Socket\s+\d+:\s+(.*)/;
-	my (undef, $type, $module, undef, $device) = split;
-	push @devs, { description => $desc, driver => $module, type => $type, device => $device } if $module;
+	if (/^Socket\s+\d+:\s+(.*)/) {
+	    $desc = $1;
+	} else {
+	    my (undef, $type, $module, undef, $device) = split;
+	    push @devs, { description => $desc, driver => $module, type => $type, device => $device };
+	}
     }
     @devs;
 }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 5b56a4511..c74e4365b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -639,7 +639,7 @@ sub readCompss {
 }
 
 sub readCompssList {
-    my ($packages) = @_;
+    my ($packages, $langs) = @_;
     my $f = install_any::getFile("compssList") or die "can't find compssList";
     my @levels = split ' ', <$f>;
 
@@ -651,7 +651,8 @@ sub readCompssList {
     }
 
     my %done;
-    foreach (split ':', $ENV{RPM_INSTALL_LANG}) {
+    foreach (@$langs) {
+	log::l("readCompssList lang: $_");
 	my $p = packageByName($packages, "locales-$_") or next;
 	foreach ($p, @{$p->{provides} || []}, map { packageByName($packages, $_) } @{$by_lang{$_} || []}) {
 	    next if !$_ || $done{$_}; $done{$_} = 1;