summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-11-21 14:54:13 +0000
committerOlivier Blin <oblin@mandriva.org>2005-11-21 14:54:13 +0000
commit015127ef9c0b88d0947f19859e70d186e19c7054 (patch)
treec421aa03b4b8ae91bc78d74fd2cac22858631b45
parent3f6a000740725db9ca16dc9a61ce59d4ffaee227 (diff)
downloaddrakx-015127ef9c0b88d0947f19859e70d186e19c7054.tar
drakx-015127ef9c0b88d0947f19859e70d186e19c7054.tar.gz
drakx-015127ef9c0b88d0947f19859e70d186e19c7054.tar.bz2
drakx-015127ef9c0b88d0947f19859e70d186e19c7054.tar.xz
drakx-015127ef9c0b88d0947f19859e70d186e19c7054.zip
fix rpmsrate negations when not installing a live system
-rw-r--r--perl-install/pkgs.pm8
1 files changed, 4 insertions, 4 deletions
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->{$_};
}