summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-07 13:02:31 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-07 13:02:31 +0000
commit36789395988f79b766b6f0d1678f53ffb84b240b (patch)
treebe4180d0768fc6dea8f5336bb0658ecbb36525b2 /perl-install
parentbeed1acf88045169653f0cdbb7748a7557f67595 (diff)
downloaddrakx-backup-do-not-use-36789395988f79b766b6f0d1678f53ffb84b240b.tar
drakx-backup-do-not-use-36789395988f79b766b6f0d1678f53ffb84b240b.tar.gz
drakx-backup-do-not-use-36789395988f79b766b6f0d1678f53ffb84b240b.tar.bz2
drakx-backup-do-not-use-36789395988f79b766b6f0d1678f53ffb84b240b.tar.xz
drakx-backup-do-not-use-36789395988f79b766b6f0d1678f53ffb84b240b.zip
do not try to install openoffice64 on x86_64 (#37318)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/harddrake22
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index df8176c08..ae57b9be0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake:
+ o do not try to install openoffice64 on x86_64 (#37318)
+
Version 10.6.14 - 5 February 2008
- bootloader-config:
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6bd946102..6b733e158 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -582,5 +582,5 @@ sub popup_menu {
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;
+ grep { !/openoffice/ && member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags;
}