[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 7e2b1e91e6930364c4b246a03a3f1c70b40da7f0
Author: Markus Roberts <Markus at reality.com>
Date:   Tue Dec 29 11:29:09 2009 -0800

    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.

diff --git a/lib/puppet/external/pson/pure.rb b/lib/puppet/external/pson/pure.rb
index 7bb18aa..53d1ea2 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

-- 
Puppet packaging for Debian