From e5038576590deb58fd90b562dea366a84df2bfb3 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Fri, 5 Sep 2008 10:00:41 +1000 Subject: Fixed #1559 - update to dmidecode fact --- CHANGELOG | 2 ++ lib/facter/util/manufacturer.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 46ef1be..29de7a3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 -- cgit