diff options
| author | Lamont Granquist <lamont@opscode.com> | 2012-11-21 11:45:04 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@opscode.com> | 2012-12-19 15:54:41 -0800 |
| commit | 042eba4404c45ddb540a933569eca2fdcea97bcb (patch) | |
| tree | cc1133dbfc22bc196a464c11526bb2ffc49ac591 /lib/chef/win32/registry.rb | |
| parent | 07a314d79ddb9ab32f6cdd383f15c6da1cc169d5 (diff) | |
| download | chef-042eba4404c45ddb540a933569eca2fdcea97bcb.tar.gz | |
32-bit/64-bit tests, and bugfixes that were uncovered
Diffstat (limited to 'lib/chef/win32/registry.rb')
| -rw-r--r-- | lib/chef/win32/registry.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/win32/registry.rb b/lib/chef/win32/registry.rb index 23b2ac73ae..617d892449 100644 --- a/lib/chef/win32/registry.rb +++ b/lib/chef/win32/registry.rb @@ -43,7 +43,7 @@ class Chef def get_values(key_path) hive, key = get_hive_and_key(key_path) key_exists!(key_path) - values = hive.open(key) do |reg| + values = hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| reg.map { |name, type, data| {:name=>name, :type=>type, :data=>data} } end end @@ -170,7 +170,7 @@ class Chef def has_subkeys?(key_path) key_exists!(key_path) hive, key = get_hive_and_key(key_path) - hive.open(key) do |reg| + hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| reg.each_key{ |key| return true } end return false @@ -180,7 +180,7 @@ class Chef subkeys = [] key_exists!(key_path) hive, key = get_hive_and_key(key_path) - hive.open(key) do |reg| + hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| reg.each_key{ |current_key| subkeys << current_key } end return subkeys @@ -208,7 +208,7 @@ class Chef def value_exists?(key_path, value) key_exists!(key_path) hive, key = get_hive_and_key(key_path) - hive.open(key) do |reg| + hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| return true if reg.any? {|val| val == value[:name] } end return false @@ -217,7 +217,7 @@ class Chef def data_exists?(key_path, value) value_exists!(key_path, value) hive, key = get_hive_and_key(key_path) - hive.open(key) do |reg| + hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| reg.each do |val_name, val_type, val_data| if val_name == value[:name] type_new = get_type_from_name(value[:type]) @@ -275,7 +275,7 @@ class Chef def type_matches?(key_path, value) value_exists!(key_path, value) hive, key = get_hive_and_key(key_path) - hive.open(key) do |reg| + hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg| reg.each do |val_name, val_type| if val_name == value[:name] type_new = get_type_from_name(value[:type]) |