diff options
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 6 | ||||
| -rw-r--r-- | perl-install/lang.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 0a68e27ec..34447fbc9 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -404,11 +404,13 @@ sub choosePackagesTree { my ($root, $leaf); if ($flat = $_[0]) { - $add_node->($_, undef) foreach sort keys %{$packages->[0]}; + $add_node->($_, undef) foreach sort grep { my $pkg = pkgs::packageByName($packages, $_); + $pkg->{medium}{selected} } keys %{$packages->[0]}; } else { foreach (sort @$compss) { ($root, $leaf) = m|(.*)/(.+)|o or ($root, $leaf) = ('', $_); - $add_node->($leaf, $root); + my $pkg = pkgs::packageByName($packages, $leaf); + $add_node->($leaf, $root) if $pkg->{medium}{selected}; } } $tree->thaw; diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d214b0932..aa3a3885d 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -124,7 +124,7 @@ my %xim = ( 'ja' => { ENC => 'eucj', XIM => 'kinput2', - XIM_PROGRAM => 'kinput2' + XIM_PROGRAM => 'kinput2', XMODIFIERS => '"@im=kinput2"', } ); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 968c3a514..9d17c352b 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -536,7 +536,7 @@ sub load_thiskind($;&$) { } #- hey, we're allowed to pci probe :) let's do a lot of probing! if (my ($c) = pci_probing::main::probe('AUDIO')) { - modules::add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]); + add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]); } } @devs, map { [ $_, $_ ] } @{$loaded{$type} || []}; |