From 015127ef9c0b88d0947f19859e70d186e19c7054 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 21 Nov 2005 14:54:13 +0000 Subject: fix rpmsrate negations when not installing a live system --- perl-install/pkgs.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 495d12acd..ea11a0455 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -634,13 +634,13 @@ sub read_rpmsrate { my $inv = s/^!//; $inv xor do { if (my ($p) = /^HW"(.*)"/) { - return $inv ^ $::o->{build_live_system} || detect_devices::matching_desc__regexp($p); + return $::o->{build_live_system} ? !$inv : detect_devices::matching_desc__regexp($p); } elsif (($p) = /^HW_CAT"(.*)"/) { - return $inv ^ $::o->{build_live_system} || modules::probe_category($p); + return $::o->{build_live_system} ? !$inv : modules::probe_category($p); } elsif (($p) = /^DRIVER"(.*)"/) { - return $inv ^ $::o->{build_live_system} || detect_devices::matching_driver__regexp($p); + return $::o->{build_live_system} ? !$inv : detect_devices::matching_driver__regexp($p); } elsif (($p) = /^TYPE"(.*)"/) { - return $inv ^ $::o->{build_live_system} || detect_devices::matching_type($p); + return $::o->{build_live_system} ? !$inv : detect_devices::matching_type($p); } else { $rpmsrate_flags_chosen->{$_}; } -- cgit v1.2.1