diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-08-11 12:41:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-08-11 12:41:57 +0000 |
| commit | e835ceab505e53e51cd9350fbab3f32889e86459 (patch) | |
| tree | 9e1613c8684653dd3eb809fad10225c42c9831b6 | |
| parent | 5a46e9b649bebef3e11e1a0459c27c71d7736e6e (diff) | |
| download | drakx-backup-do-not-use-e835ceab505e53e51cd9350fbab3f32889e86459.tar drakx-backup-do-not-use-e835ceab505e53e51cd9350fbab3f32889e86459.tar.gz drakx-backup-do-not-use-e835ceab505e53e51cd9350fbab3f32889e86459.tar.bz2 drakx-backup-do-not-use-e835ceab505e53e51cd9350fbab3f32889e86459.tar.xz drakx-backup-do-not-use-e835ceab505e53e51cd9350fbab3f32889e86459.zip | |
(dmidecode) fix parsing dmidecode output (broken since we use
dmidecode-2.10, aka since November 24 2008)
Pixel: I hate you!
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 10 insertions, 1 deletions
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 |