From ac3b0497c8dd2f56b82fc735448b7b64915167a2 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 8 Nov 2005 10:03:06 +0000 Subject: log is mixed with valid data (bugzilla #19654) --- perl-install/fs/dmraid.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'perl-install/fs') diff --git a/perl-install/fs/dmraid.pm b/perl-install/fs/dmraid.pm index 4b317ef5e..a45a90405 100644 --- a/perl-install/fs/dmraid.pm +++ b/perl-install/fs/dmraid.pm @@ -46,7 +46,7 @@ sub _raid_devices_raw() { chomp; log::l("got: $_"); my %l; @l{qw(pv format vg level status size)} = split(':'); - \%l; + if_(defined $l{size}, \%l); } call_dmraid('-ccr'); } @@ -67,7 +67,7 @@ sub _sets_raw() { chomp; log::l("got: $_"); my %l; @l{qw(name size stride level status subsets devs spares)} = split(':'); - \%l; + if_(defined $l{spares}, \%l); } call_dmraid('-ccs'); } @@ -167,6 +167,22 @@ if ($ENV{DRAKX_DEBUG_DMRAID}) { # ERROR: sil: only 3/4 metadata areas found on /dev/sdb, electing... }, + weird_nvidia => { + '-ccs' => <<'EO', +/dev/sda: "sil" and "nvidia" formats discovered (using nvidia)! +/dev/sdb: "sil" and "nvidia" formats discovered (using nvidia)! +nvidia_bcjdbjfa:586114702:128:mirror:ok:0:2:0 +EO + '-ccr' => <<'EO', +/dev/sda: "sil" and "nvidia" formats discovered (using nvidia)! +/dev/sdb: "sil" and "nvidia" formats discovered (using nvidia)! +/dev/sda:nvidia:nvidia_bcjdbjfa:mirror:ok:586114702:0 +/dev/sdb:nvidia:nvidia_bcjdbjfa:mirror:ok:586114702:0 +EO + # ERROR: multiple match for set nvidia_bcjdbjfa: nvidia_bcjdbjfa + }, + + ); *call_dmraid = sub { -- cgit v1.2.1