summaryrefslogtreecommitdiff
path: root/lib/chef/monkey_patches
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-02-28 19:31:46 -0800
committerTim Smith <tsmith@chef.io>2019-02-28 19:31:46 -0800
commit9a2a0f148ade4c88fa44ef893c716e277a89c846 (patch)
treef521dee4f8ed6c1729c56c7875f141fe3885b60b /lib/chef/monkey_patches
parent7d5ed61a31075b4dec51b00dcdd252cdb41558a9 (diff)
downloadchef-9a2a0f148ade4c88fa44ef893c716e277a89c846.tar.gz
Remove checks for old versions of Ruby
Some of this supports older versions of Ruby 2.1/2.2 and others support Ruby 1.8 Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/monkey_patches')
-rw-r--r--lib/chef/monkey_patches/win32/registry.rb28
1 files changed, 1 insertions, 27 deletions
diff --git a/lib/chef/monkey_patches/win32/registry.rb b/lib/chef/monkey_patches/win32/registry.rb
index a08d67becf..26ba31d60f 100644
--- a/lib/chef/monkey_patches/win32/registry.rb
+++ b/lib/chef/monkey_patches/win32/registry.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2019, Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,31 +56,5 @@ module Win32
end
end
-
- if RUBY_VERSION =~ /^2\.1/
- # ::Win32::Registry#write does not correctly handle data in Ruby 2.1
- # This bug is _reportedly_ resolved in Ruby 2.1.7 and 2.2.3
- # but fails in appveyor on 2.1.8 unless we keep applying this monkeypatch
- # https://bugs.ruby-lang.org/issues/11439
- def write(name, type, data)
- case type
- when REG_SZ, REG_EXPAND_SZ
- data = data.to_s.encode(WCHAR) + WCHAR_NUL
- when REG_MULTI_SZ
- data = data.to_a.map { |s| s.encode(WCHAR) }.join(WCHAR_NUL) << WCHAR_NUL << WCHAR_NUL
- when REG_BINARY
- data = data.to_s
- when REG_DWORD
- data = API.packdw(data.to_i)
- when REG_DWORD_BIG_ENDIAN
- data = [data.to_i].pack("N")
- when REG_QWORD
- data = API.packqw(data.to_i)
- else
- raise TypeError, "Unsupported type #{type}"
- end
- API.SetValue(@hkey, name, type, data, data.bytesize)
- end
- end
end
end