From 8a67e325a986bb45f5d18469ddb02cafbe27f996 Mon Sep 17 00:00:00 2001 From: mccune Date: Wed, 13 Jun 2007 18:33:06 +0000 Subject: Fixed problem with executing system_profiler and sw_vers on non Darwin hosts. git-svn-id: http://reductivelabs.com/svn/facter/trunk@208 1f5c1d6a-bddf-0310-8f58-fc49e503516a --- lib/facter/macosx.rb | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'lib/facter/macosx.rb') diff --git a/lib/facter/macosx.rb b/lib/facter/macosx.rb index 2c4c2fa..73339b7 100644 --- a/lib/facter/macosx.rb +++ b/lib/facter/macosx.rb @@ -54,29 +54,31 @@ module Facter::Macosx end end -Facter::Macosx.hardware_overview.each do |fact, value| - Facter.add("sp_#{fact}") do - confine :kernel => :darwin - setcode do - value +if Facter.kernel == "Darwin" + Facter::Macosx.hardware_overview.each do |fact, value| + Facter.add("sp_#{fact}") do + confine :kernel => :darwin + setcode do + value + end end end -end -Facter::Macosx.os_overview.each do |fact, value| - Facter.add("sp_#{fact}") do - confine :kernel => :darwin - setcode do - value + Facter::Macosx.os_overview.each do |fact, value| + Facter.add("sp_#{fact}") do + confine :kernel => :darwin + setcode do + value + end end end -end -Facter::Macosx.sw_vers.each do |fact, value| - Facter.add(fact) do - confine :kernel => :darwin - setcode do - value + Facter::Macosx.sw_vers.each do |fact, value| + Facter.add(fact) do + confine :kernel => :darwin + setcode do + value + end end end end -- cgit