no_comment

5 files changed, 26 insertions, 15 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a721ae99a..56fc9c5a7 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -252,8 +252,13 @@ sub setPackages($) {
 	push @{$o->{default_packages}}, "alsa" if modules::get_alias("sound") =~ /^snd-card-/;
 
 	pkgs::getDeps($o->{prefix}, $o->{packages});
+	pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
+
+	#- must be done after selecting base packages (to save memory)
+	pkgs::getProvides($o->{packages});
 
 	$o->{compss} = pkgs::readCompss($o->{packages});
+	#- must be done after getProvides
 	$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
 	($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss});
 
@@ -264,12 +269,7 @@ sub setPackages($) {
 	require timezone;
 	require lang;
 	push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/;
-	$_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { $o->{packages}{$_} } @l;
-
-	pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
-
-	#- must be done after selecting base packages (to save memory)
-	pkgs::getProvides($o->{packages});
+	$_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l;
 
     } else {
 	pkgs::unselectAllPackages($o->{packages});
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 60cee8995..ea2444e68 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -787,7 +787,6 @@ sub setupXfreeAfter {
 	    Xconfigurator::rewriteInittab(3) unless $::testing; #- disable automatic start-up of X11 on error.
 	}
     }
-    log::l("large icon? $o->{X}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024");
     if ($o->{X}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024) {
 	log::l("setting large icon style for kde");
 	install_any::kderc_largedisplay($o->{prefix});
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 0078ec6a1..0a68e27ec 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -333,8 +333,7 @@ a percentage of %d%% will install as many packages as possible.", $percentage, $
 		)
 	 );
     $spin->signal_connect(changed => my $changed = sub { 
-	$val = $spin->get_value_as_int / 100 * $max_size;
-	log::l("val $val ", pkgs::correctSize($val / sqr(1024)));
+	$val = $spin->get_value_as_int / 100 * $max_size_;
 	$mb->set(sprintf("(%dMB)", pkgs::correctSize($val / sqr(1024)))); 
     }); &$changed();
     $spin->signal_connect(activate => sub { $w->{retval} = 1; Gtk->main_quit });
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 5b0a09de9..588b9c20d 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -155,6 +155,7 @@ arch() =~ /^ppc/ ? (
 ),
 );
 
+
 #-######################################################################################
 #- Functions
 #-######################################################################################
@@ -171,6 +172,19 @@ sub text2keyboard {
     die "unknown keyboard $t";
 }
 
+sub loadkeys_files {
+    my $p = "/usr/lib/kbd/keymaps/i386/*";
+    my $post = ".kmap.gz";
+    my %trans = ("cz-latin2" => "cz-lat2");
+    my @l;
+    foreach (values %keyboards) {
+	local $_ = $trans{$_->[1]} || $_->[1];
+	my ($l) = glob("$p/$_$post");
+	$l or /(..)/ and ($l) = glob("$p/$1$post");
+	push @l, $l if $l;
+	print STDERR "unknown $_\n" if $_[0] && !$l;
+    }
+}
 
 sub lang2keyboard($) {
     local ($_) = @_;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4a7d6d3f9..9a3d6478b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -524,17 +524,16 @@ sub readCompssList {
     foreach (<$f>) {
 	/^\s*$/ || /^#/ and next;
 	my ($name, @values) = split;
-	my $p = $packages->[0]{$name} or log::l("unknown entry $name (in compssList)"), next;
+	my $p = packageByName($packages, $name) or log::l("unknown entry $name (in compssList)"), next;
 	$p->{values} = \@values;
     }
 
     my %done;
     foreach (split ':', $ENV{RPM_INSTALL_LANG}) {
-	my $p = $packages->[0]{"locales-$_"} || {};
-	foreach ("locales-$_", @{$p->{provides} || []}, @{$by_lang{$_} || []}) {
-	    next if $done{$_}; $done{$_} = 1;
-	    my $p = $packages->[0]{$_} or next;
-	    $p->{values} = [ map { $_ + 90 } @{$p->{values} || [ (0) x @levels ]} ];
+	my $p = packageByName($packages, "locales-$_") or next;
+	foreach ($p, @{$p->{provides} || []}, map { packageByName($packages, $_) } @{$by_lang{$_} || []}) {
+	    next if !$_ || $done{$_}; $done{$_} = 1;
+	    $_->{values} = [ map { $_ + 90 } @{$_->{values} || [ (0) x @levels ]} ];
 	}
     }
     my $l = { map_index { $_ => $::i } @levels };