diff options
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 9d745feb5..92bffcb2d 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -16,6 +16,7 @@ use ugtk2 qw(:create :helpers :wrappers); use interactive; use harddrake::data; #- needs to stay after use-ugtk2 as long as this module defines globals containing some N() use fsedit; +use pkgs; use POSIX qw(:sys_wait_h); @@ -503,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([ list_hardware_packages() ], [ qw(ati.2 dmraid gnome-alsamixer mdadm xmms-alsa) ])) { + if (my @packages = difference2([ pkgs::list_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 $_: @@ -578,13 +579,3 @@ sub popup_menu { return 0; }; } - -sub simple_read_rpmsrate() { - require pkgs; - my ($rates, $flags) = pkgs::read_rpmsrate({}, { }, '/usr/share/meta-task/rpmsrate-raw', 0); - grep { member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags; -} - -sub list_hardware_packages() { - grep { !/openoffice/ } simple_read_rpmsrate(); -} |