diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-09-05 10:00:41 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-09-05 10:03:51 +1000 |
| commit | e5038576590deb58fd90b562dea366a84df2bfb3 (patch) | |
| tree | 35b9b79d24a5a5b968f177afd4c942e35531a468 | |
| parent | 518393ee0a6943237d66c4143d70370475598b17 (diff) | |
| download | facter-e5038576590deb58fd90b562dea366a84df2bfb3.tar.gz facter-e5038576590deb58fd90b562dea366a84df2bfb3.tar.xz facter-e5038576590deb58fd90b562dea366a84df2bfb3.zip | |
Fixed #1559 - update to dmidecode fact
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/facter/util/manufacturer.rb | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,6 @@ 1.5.1: + Fixed #1559 - update to dmidecode fact + Added a Process.waitall thread when there's a timeout, to avoid zombies. Set the timeout the host-based and resolve-based resolutions to 2. diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb index 139e668..665fa76 100644 --- a/lib/facter/util/manufacturer.rb +++ b/lib/facter/util/manufacturer.rb @@ -22,8 +22,8 @@ module Facter::Manufacturer name.each_pair do |key,v| v.each do |value| output.split("Handle").each do |line| - if line =~ /#{key}/ and line =~ /#{value} (\w.*)\n*./ - result = $1 + if line =~ /#{key}/ and line =~ /#{value} ([-\w].*)\n*./ + result = $1 Facter.add(value.chomp(':').gsub(' ','')) do confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd ] setcode do |