diff options
| author | Markus Roberts <Markus@reality.com> | 2009-11-09 15:10:46 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-11-12 21:18:59 +1100 |
| commit | 3fdc8effbe25c9653d8bc86f2d4847984d4cb6f3 (patch) | |
| tree | 562a8e07ac615b3eddf7a0afc1e350abd6d986a7 /lib/puppet/external | |
| parent | b1722871ec27aa451be17e6fe6e099cc2f35cf7b (diff) | |
| download | puppet-3fdc8effbe25c9653d8bc86f2d4847984d4cb6f3.tar.gz puppet-3fdc8effbe25c9653d8bc86f2d4847984d4cb6f3.tar.xz puppet-3fdc8effbe25c9653d8bc86f2d4847984d4cb6f3.zip | |
Ticket #2770 (deserializing Exec[...]s with "\n"s)
The resource reference logic wasn't handling resources with "\n"s
in their namevars gracefully, and detection of this was complicated
by infelicitous exception reporting.
Note that this patch will require a merge when combined with the
patch for #2657.
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet/external')
| -rw-r--r-- | lib/puppet/external/pson/pure.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/external/pson/pure.rb b/lib/puppet/external/pson/pure.rb index 43f39b2a6..7bb18aa70 100644 --- a/lib/puppet/external/pson/pure.rb +++ b/lib/puppet/external/pson/pure.rb @@ -11,8 +11,8 @@ module PSON UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8') # :nodoc: UTF8toUTF16.iconv('no bom') rescue LoadError - raise MissingUnicodeSupport, - "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions" + # We actually don't care + Puppet.warning "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions" rescue Errno::EINVAL, Iconv::InvalidEncoding # Iconv doesn't support big endian utf-16. Let's try to hack this manually # into the converters. |