diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-12-15 14:28:13 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-12-15 14:28:13 -0800 |
| commit | 3584bab685adede761faabd4c2c0d396d8665bb3 (patch) | |
| tree | cdc971a0809e8f88a4d0a8f9ac29e52ea85bf17a | |
| parent | 3f178af707ac7112428c0f7d5e84d09d018c28ae (diff) | |
| download | chef-jdm/ruby21.tar.gz | |
ole_initialize thingsjdm/ruby21
| -rw-r--r-- | lib/chef/platform/query_helpers.rb | 4 | ||||
| -rw-r--r-- | lib/chef/win32/version.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb index 334ab278d1..80dbc5e29c 100644 --- a/lib/chef/platform/query_helpers.rb +++ b/lib/chef/platform/query_helpers.rb @@ -35,13 +35,13 @@ class Chef # 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 - WIN32OLE.ole_initialize + #WIN32OLE.ole_initialize wmi = WmiLite::Wmi.new host = wmi.first_of('Win32_OperatingSystem') is_server_2003 = (host['version'] && host['version'].start_with?("5.2")) - WIN32OLE.ole_uninitialize + #WIN32OLE.ole_uninitialize is_server_2003 end diff --git a/lib/chef/win32/version.rb b/lib/chef/win32/version.rb index d16bd8c12f..dee21f238b 100644 --- a/lib/chef/win32/version.rb +++ b/lib/chef/win32/version.rb @@ -126,13 +126,13 @@ class Chef # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db # https://github.com/ruby/ruby/commit/27ed294c7134c0de582007af3c915a635a6506cd - WIN32OLE.ole_initialize + #WIN32OLE.ole_initialize wmi = WmiLite::Wmi.new os_info = wmi.first_of('Win32_OperatingSystem') os_version = os_info['version'] - WIN32OLE.ole_uninitialize + #WIN32OLE.ole_uninitialize # The operating system version is a string in the following form # that can be split into components based on the '.' delimiter: |