diff options
Diffstat (limited to 'lib/chef/mixin')
| -rw-r--r-- | lib/chef/mixin/deep_merge.rb | 2 | ||||
| -rw-r--r-- | lib/chef/mixin/wide_string.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb index c0b2d0d0c5..7016b08ff7 100644 --- a/lib/chef/mixin/deep_merge.rb +++ b/lib/chef/mixin/deep_merge.rb @@ -75,7 +75,7 @@ class Chef end when Array if dest.kind_of?(Array) - dest = dest | source + dest |= source else dest = source end diff --git a/lib/chef/mixin/wide_string.rb b/lib/chef/mixin/wide_string.rb index 4342ef1650..ef7828e2d8 100644 --- a/lib/chef/mixin/wide_string.rb +++ b/lib/chef/mixin/wide_string.rb @@ -34,7 +34,7 @@ class Chef ustring = (ustring + "").force_encoding("UTF-8") if ustring.respond_to?(:force_encoding) && ustring.encoding.name != "UTF-8" # ensure we have the double-null termination Windows Wide likes - ustring = ustring + "\000\000" if ustring.length == 0 || ustring[-1].chr != "\000" + ustring += "\000\000" if ustring.length == 0 || ustring[-1].chr != "\000" # encode it all as UTF-16LE AKA Windows Wide Character AKA Windows Unicode ustring = begin |