summaryrefslogtreecommitdiff
path: root/lib/chef/platform
diff options
context:
space:
mode:
authorKartik Null Cating-Subramanian <ksubramanian@chef.io>2015-07-22 15:17:58 -0400
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2015-07-24 15:12:08 -0400
commitca8a8bdb000c7cb82588cc56ddfb32464babf3c3 (patch)
tree4a799a0dc2bcd0285dc37c69541b0445e07a69f2 /lib/chef/platform
parent283301d40e6449f9d513d18afacdb6ca360898d9 (diff)
downloadchef-ca8a8bdb000c7cb82588cc56ddfb32464babf3c3.tar.gz
Add ability to specify dependencies in chef-service-manager.
Diffstat (limited to 'lib/chef/platform')
-rw-r--r--lib/chef/platform/query_helpers.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb
index b3948eac21..e64189fbd6 100644
--- a/lib/chef/platform/query_helpers.rb
+++ b/lib/chef/platform/query_helpers.rb
@@ -25,13 +25,10 @@ class Chef
end
def windows_server_2003?
+ # WMI startup shouldn't be performed unless we're on Windows.
return false unless windows?
require 'wmi-lite/wmi'
- # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0
- # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db
- # https://github.com/ruby/ruby/commit/27ed294c7134c0de582007af3c915a635a6506cd
-
wmi = WmiLite::Wmi.new
host = wmi.first_of('Win32_OperatingSystem')
is_server_2003 = (host['version'] && host['version'].start_with?("5.2"))