diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-29 11:29:09 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-30 11:34:56 +1100 |
| commit | 7e2b1e91e6930364c4b246a03a3f1c70b40da7f0 (patch) | |
| tree | eed18d78364ded31681092554acc0fa9484d96e4 /lib | |
| parent | d1ff4b3fca31ee99276c26bc1df6391cfc79254a (diff) | |
| download | puppet-7e2b1e91e6930364c4b246a03a3f1c70b40da7f0.tar.gz puppet-7e2b1e91e6930364c4b246a03a3f1c70b40da7f0.tar.xz puppet-7e2b1e91e6930364c4b246a03a3f1c70b40da7f0.zip | |
Fix for #2995 (don't fail to load PSON when UTF-8 missing)
We don't actually rely on iconv's UTF-8 support, so its absence
shouldn't cause the PSON feature to fail on system (e.g. HPUX)
where it isn't fully implemented.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/external/pson/pure.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/external/pson/pure.rb b/lib/puppet/external/pson/pure.rb index 7bb18aa70..53d1ea2a7 100644 --- a/lib/puppet/external/pson/pure.rb +++ b/lib/puppet/external/pson/pure.rb @@ -50,7 +50,7 @@ module PSON UTF16toUTF8 = swapper.new(UTF16toUTF8) # :nodoc: end rescue Errno::EINVAL, Iconv::InvalidEncoding - raise MissingUnicodeSupport, "iconv doesn't seem to support UTF-8/UTF-16 conversions" + Puppet.warning "iconv doesn't seem to support UTF-8/UTF-16 conversions" ensure $VERBOSE = old_verbose end |