summaryrefslogtreecommitdiffstats
path: root/lib/facter/macosx.rb
diff options
context:
space:
mode:
authormccune <mccune@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2007-06-13 18:33:06 +0000
committermccune <mccune@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2007-06-13 18:33:06 +0000
commit8a67e325a986bb45f5d18469ddb02cafbe27f996 (patch)
tree089cd0188680cd1ed121510f0ca0e3dd55ed2c6d /lib/facter/macosx.rb
parent43933dd0fbdb8c03da6776fb56bfe60a1c71c984 (diff)
downloadfacter-8a67e325a986bb45f5d18469ddb02cafbe27f996.tar.gz
facter-8a67e325a986bb45f5d18469ddb02cafbe27f996.tar.xz
facter-8a67e325a986bb45f5d18469ddb02cafbe27f996.zip
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
Diffstat (limited to 'lib/facter/macosx.rb')
-rw-r--r--lib/facter/macosx.rb36
1 files changed, 19 insertions, 17 deletions
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