diff options
| author | Adam Edwards <adamed@opscode.com> | 2014-05-02 09:22:40 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-05-30 13:05:47 -0700 |
| commit | 771662f8edc7f8251379f3207399bbdffa2248cc (patch) | |
| tree | 8467ad262dd7618b22daa4f8b3d88e3359bf550c /lib/chef/win32/version.rb | |
| parent | a6b19c08da6365e883d38d0ed202068df16301ab (diff) | |
| download | chef-771662f8edc7f8251379f3207399bbdffa2248cc.tar.gz | |
Re-implement ruby-wmi functionality
Diffstat (limited to 'lib/chef/win32/version.rb')
| -rw-r--r-- | lib/chef/win32/version.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/chef/win32/version.rb b/lib/chef/win32/version.rb index 7f5fcceead..e2776bdd1b 100644 --- a/lib/chef/win32/version.rb +++ b/lib/chef/win32/version.rb @@ -18,6 +18,7 @@ require 'chef/win32/api' require 'chef/win32/api/system' +require 'chef/win32/wmi' class Chef module ReservedNames::Win32 @@ -114,7 +115,6 @@ class Chef # version numbers on Windows Server 2012 R2 and Windows 8.1 -- # WMI always returns the truth. See article at # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx - require 'ruby-wmi' # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0 # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db @@ -122,8 +122,9 @@ class Chef WIN32OLE.ole_initialize - os_info = WMI::Win32_OperatingSystem.find(:first) - os_version = os_info.send('Version') + wmi = WMI.new + os_info = wmi.first_of('Win32_OperatingSystem') + os_version = os_info['version'] WIN32OLE.ole_uninitialize |