diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-07 11:31:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 11:31:08 -0800 |
| commit | cab6b8bfd1f0a010682365c2623e0d28dea0a93a (patch) | |
| tree | 3fb0b94268a34c79366c6fa6543351cf77ee63da | |
| parent | 8760b3b6af613548119e887e04d072286248fd1f (diff) | |
| parent | a16c8a7aa27ac4b4eefe531f7c94bc0997b1ff4c (diff) | |
| download | ohai-cab6b8bfd1f0a010682365c2623e0d28dea0a93a.tar.gz | |
Merge pull request #1616 from jaymzh/windows_packages
Update `packages` for Windows to be complete.
| -rw-r--r-- | lib/ohai/plugins/packages.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ohai/plugins/packages.rb b/lib/ohai/plugins/packages.rb index e9ce2b3d..33591792 100644 --- a/lib/ohai/plugins/packages.rb +++ b/lib/ohai/plugins/packages.rb @@ -106,7 +106,7 @@ Ohai.plugin(:Packages) do end end - def collect_programs_from_registry_key(key_path) + def collect_programs_from_registry_key(repo, key_path) # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx if ::RbConfig::CONFIG["target_cpu"] == "i386" reg_type = Win32::Registry::KEY_READ | 0x100 @@ -115,7 +115,7 @@ Ohai.plugin(:Packages) do else reg_type = Win32::Registry::KEY_READ end - Win32::Registry::HKEY_LOCAL_MACHINE.open(key_path, reg_type) do |reg| + repo.open(key_path, reg_type) do |reg| reg.each_key do |key, _wtime| pkg = reg.open(key) name = pkg["DisplayName"] rescue nil @@ -133,9 +133,10 @@ Ohai.plugin(:Packages) do collect_data(:windows) do require "win32/registry" unless defined?(Win32::Registry) packages Mash.new - collect_programs_from_registry_key('Software\Microsoft\Windows\CurrentVersion\Uninstall') + collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall') + collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall') + collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall') # on 64 bit systems, 32 bit programs are stored here - collect_programs_from_registry_key('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall') end collect_data(:aix) do |