From e835ceab505e53e51cd9350fbab3f32889e86459 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 11 Aug 2009 12:41:57 +0000 Subject: (dmidecode) fix parsing dmidecode output (broken since we use dmidecode-2.10, aka since November 24 2008) Pixel: I hate you! (backported from trunk) --- perl-install/NEWS | 3 +++ perl-install/detect_devices.pm | 5 ++++- perl-install/install/NEWS | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 24c44f14e..f946624e8 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- fix parsing dmidecode output (broken since we use dmidecode-2.10, + aka since November 24 2008) + Version 12.32 - 23 April 2009 - don't set umask=0 by default on windows partitions in 'secure' level. diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index ce6c8e029..2d4f1db85 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1013,7 +1013,10 @@ sub dmidecode() { my ($ver, @l) = run_program::get_stdout('dmidecode'); my $tab = "\t"; - if ($ver =~ /(\d+\.\d+)/ && $1 >= 2.7) { + + my ($major, $minor) = $ver =~ /(\d+)\.(\d+)/; + + if ($major > 2 || $major == 2 && $minor >7) { #- new dmidecode output is less indented $tab = ''; #- drop header diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 099c33a0a..c4a1fcde9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- fix parsing dmidecode output (broken since we use dmidecode-2.10, + aka since November 24 2008) + Version 12.35 - 24 April 2009 - remove unused parameter in installPackages -- cgit v1.2.1