diff options
| -rw-r--r-- | perl-install/pkgs.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index ddd7de717..40d1cc976 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -147,7 +147,7 @@ sub simple_read_rpmsrate { grep { member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags; } -sub list_hardware_packages { +sub detect_rpmsrate_hardware_packages { my ($o_match_all_hardware) = @_; grep { !/openoffice/ } simple_read_rpmsrate($o_match_all_hardware); } @@ -197,7 +197,7 @@ sub detect_network_drivers { sub detect_hardware_packages { my ($do_pkgs, $o_match_all_hardware) = @_; ( - ($::isInstall ? () : list_hardware_packages($o_match_all_hardware)), + ($::isInstall ? () : detect_rpmsrate_hardware_packages($o_match_all_hardware)), detect_graphical_drivers($do_pkgs, $o_match_all_hardware), detect_network_drivers($do_pkgs, $o_match_all_hardware), ); diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 92bffcb2d..2087f1b09 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -504,7 +504,7 @@ $tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk2::T $SIG{CHLD} = undef; #local $SIG{CHLD} = sub {}; - if (my @packages = difference2([ pkgs::list_hardware_packages() ], [ qw(ati.2 dmraid gnome-alsamixer mdadm xmms-alsa) ])) { + if (my @packages = difference2([ pkgs::detect_rpmsrate_hardware_packages() ], [ qw(ati.2 dmraid gnome-alsamixer mdadm xmms-alsa) ])) { @packages = grep { !$in->do_pkgs->is_installed($_) } @packages; # workarounding do_pkgs->is_available() destroying $_: |