diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-05-26 12:06:23 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-05-26 12:06:23 -0700 |
| commit | 06e85b1b94da636ba7bc269eb361fd7c22f6f7af (patch) | |
| tree | 0cf1a60d4617c6ef22c6b8713a802e5fc41b409d | |
| parent | fd2a7bc02962b8151ece8fc7257d36a292feb973 (diff) | |
| parent | acb1401d11712114a83af8b469367e191b11ae29 (diff) | |
| download | ohai-06e85b1b94da636ba7bc269eb361fd7c22f6f7af.tar.gz | |
Merge pull request #548 from chef/lcg/fix-utf8
force ohai output to UTF-8
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | lib/ohai/system.rb | 2 | ||||
| -rw-r--r-- | ohai.gemspec | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f8251b5..7704772f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Ohai Changelog +## Unreleased + +* [PR #548](https://github.com/chef/ohai/548): + Coerce non-UTF8 strings to UTF8 in output to suppress UTF8 encoding exceptions + ## Release 8.4.0 * Correctly skip unwanted DMI information diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb index 511fb9ea..87ca46d2 100644 --- a/lib/ohai/system.rb +++ b/lib/ohai/system.rb @@ -178,7 +178,7 @@ module Ohai # Pretty Print this object as JSON # def json_pretty_print(item=nil) - FFI_Yajl::Encoder.new(:pretty => true).encode(item || @data) + FFI_Yajl::Encoder.new(pretty: true, validate_utf8: false).encode(item || @data) end def attributes_print(a) diff --git a/ohai.gemspec b/ohai.gemspec index 1f85f7b6..b8789a05 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "mime-types", "~> 2.0" s.add_dependency "systemu", "~> 2.6.4" - s.add_dependency "ffi-yajl", ">= 1.1", "< 3.0" + s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "mixlib-cli" s.add_dependency "mixlib-config", "~> 2.0" s.add_dependency "mixlib-log" |