summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-11-21 14:38:49 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-11-21 14:38:49 +0000
commit2c0814fcbd9b708df91232516db3867c5697adf7 (patch)
treef1f033ca9abf0b2cd9c499f10e0a2423670c1bc5
parentcdaf3b37916cae047ce4475df8e4c9cd0658262d (diff)
downloaddrakx-2c0814fcbd9b708df91232516db3867c5697adf7.tar
drakx-2c0814fcbd9b708df91232516db3867c5697adf7.tar.gz
drakx-2c0814fcbd9b708df91232516db3867c5697adf7.tar.bz2
drakx-2c0814fcbd9b708df91232516db3867c5697adf7.tar.xz
drakx-2c0814fcbd9b708df91232516db3867c5697adf7.zip
(read_rpmsrate) do not match CAT_(KDE|GNOME|...) and ignore ! while
installing a live system
-rw-r--r--perl-install/pkgs.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 9d11f0652..495d12acd 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -633,15 +633,14 @@ sub read_rpmsrate {
my $ok = find {
my $inv = s/^!//;
$inv xor do {
- return 1 if $::o->{build_live_system};
if (my ($p) = /^HW"(.*)"/) {
- detect_devices::matching_desc__regexp($p);
+ return $inv ^ $::o->{build_live_system} || detect_devices::matching_desc__regexp($p);
} elsif (($p) = /^HW_CAT"(.*)"/) {
- modules::probe_category($p);
+ return $inv ^ $::o->{build_live_system} || modules::probe_category($p);
} elsif (($p) = /^DRIVER"(.*)"/) {
- detect_devices::matching_driver__regexp($p);
+ return $inv ^ $::o->{build_live_system} || detect_devices::matching_driver__regexp($p);
} elsif (($p) = /^TYPE"(.*)"/) {
- detect_devices::matching_type($p);
+ return $inv ^ $::o->{build_live_system} || detect_devices::matching_type($p);
} else {
$rpmsrate_flags_chosen->{$_};
}