extract openoffice hack from the light rpmsrate abstraction (to be used by other tools)

1 files changed, 6 insertions, 2 deletions

diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6b733e158..9d745feb5 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -503,7 +503,7 @@ $tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk2::T
     $SIG{CHLD} = undef;
     #local $SIG{CHLD} = sub {};
 
-    if (my @packages = difference2([ simple_read_rpmsrate() ], [ qw(ati.2 dmraid gnome-alsamixer mdadm xmms-alsa) ])) {
+    if (my @packages = difference2([ 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 $_:
@@ -582,5 +582,9 @@ sub popup_menu {
 sub simple_read_rpmsrate() {
     require pkgs;
     my ($rates, $flags) = pkgs::read_rpmsrate({}, { }, '/usr/share/meta-task/rpmsrate-raw', 0);
-    grep { !/openoffice/ && member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags;
+    grep { member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags;
+}
+
+sub list_hardware_packages() {
+    grep { !/openoffice/ } simple_read_rpmsrate();
 }