summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-21 12:29:55 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-21 12:29:55 +0000
commit57c79a206dace7a3225467b26e193047ca5632d7 (patch)
tree0f526e2bcaeabc964973eef85996754171905c1c
parenteba1c138f3e7ef62d5d2ebb022ef38ac9d170f7a (diff)
downloaddrakx-57c79a206dace7a3225467b26e193047ca5632d7.tar
drakx-57c79a206dace7a3225467b26e193047ca5632d7.tar.gz
drakx-57c79a206dace7a3225467b26e193047ca5632d7.tar.bz2
drakx-57c79a206dace7a3225467b26e193047ca5632d7.tar.xz
drakx-57c79a206dace7a3225467b26e193047ca5632d7.zip
(read_rpmsrate) use the installer's logic regarding flags in
standalone mode, thus fixing wrongly selecting some 32bits packages on x86_64 (#50148) (regression introduced in r256659 on 2009-04-17; "(detect_hardware_packages,simple_read_rpmsrate) do not offer to install KDE packages on GNOME or LXDE (#49671)")
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/pkgs.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b78bd75a9..af50db747 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- diskdrake:
o display a progress bar while formating an ext4 partition
o render ext4 partition as red like ext3 ones
+- harddrake:
+ o fix wrongly selecting some 32bits packages on x86_64 (#50148)
Version 12.29 - 21 April 2009
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 526a91b41..057fcec78 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -136,9 +136,10 @@ sub read_rpmsrate {
$ok ? 'TRUE' : @$user_flags ? join('||', @$user_flags) : 'FALSE';
} @flags;
+ @flags = member('FALSE', @flags) ? 'FALSE' : @flags;
if ($::isInstall) {
$p->set_rate($rates->{$_});
- $p->set_rflags(member('FALSE', @flags) ? 'FALSE' : @flags);
+ $p->set_rflags(@flags);
} else {
$flags->{$_} = \@flags;
}