From 2c0814fcbd9b708df91232516db3867c5697adf7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 21 Nov 2005 14:38:49 +0000 Subject: (read_rpmsrate) do not match CAT_(KDE|GNOME|...) and ignore ! while installing a live system --- perl-install/pkgs.pm | 9 ++++----- 1 file 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->{$_}; } -- cgit v1.2.1