summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-02-03 17:12:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-02-03 17:12:32 +0000
commit2b8d0cf768d5e50ecac905a0f0b002f3877a6d41 (patch)
tree2df785f3a341b06951af6d243b239bed06972aae
parentd05a0d60e48a6307e802b63d3f91484b70758775 (diff)
downloaddrakx-2b8d0cf768d5e50ecac905a0f0b002f3877a6d41.tar
drakx-2b8d0cf768d5e50ecac905a0f0b002f3877a6d41.tar.gz
drakx-2b8d0cf768d5e50ecac905a0f0b002f3877a6d41.tar.bz2
drakx-2b8d0cf768d5e50ecac905a0f0b002f3877a6d41.tar.xz
drakx-2b8d0cf768d5e50ecac905a0f0b002f3877a6d41.zip
oops, perl_checker compliance
-rw-r--r--perl-install/detect_devices.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 1f797fccf..0d516ed3a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -933,12 +933,9 @@ sub dmidecode_category {
sub dmi_detect_memory() {
my @l1 = map { $_->{'Enabled Size'} =~ /(\d+) MB/ && $1 } dmidecode_category('Memory Module');
my @l2 = map { $_->{'Form Factor'} =~ /^(SIMM|SIP|DIP|DIMM|RIMM|SODIMM|SRIMM)$/ &&
- ($_->{Size} =~ /(\d+) MB/ && $1 || $_->{Size} =~ /(\d+) kB/ && $1 * 1024)
+ ($_->{Size} =~ /(\d+) MB/ && $1 || $_->{Size} =~ /(\d+) kB/ && $1 * 1024);
} dmidecode_category('Memory Device');
- my $s1 = join(' ', grep {$_} @l1);
- my $s2 = join(' ', grep {$_} @l2);
- warn "$s1 <|> $s2\n" if $s1 && $s2 && $s1 ne $s2;
- max(sum(@l1), sum(@l2))
+ max(sum(@l1), sum(@l2));
}
sub computer_info() {