2 workarounds for yaml issues with ruby 1.8.1 where added to this file: * 1c69af2 - Dec 3 2009 * e8bce7a - Oct 24 2009
e44430b (Mar 22 2010) completely circumvents the yaml library bundled with ruby, which solves the yaml issues with 1.8.1. This patch removes the code preventing fact compression with ruby 1.8.1. Signed-off-by: Marc Fournier <[email protected]> --- lib/puppet/network/formats.rb | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb index a98dcbc..24c7b53 100644 --- a/lib/puppet/network/formats.rb +++ b/lib/puppet/network/formats.rb @@ -26,9 +26,8 @@ Puppet::Network::FormatHandler.create(:yaml, :mime => "text/yaml") do yaml end - # Everything's supported unless you're on 1.8.1 def supported?(klass) - RUBY_VERSION != '1.8.1' + true end # fixup invalid yaml as per: @@ -79,9 +78,8 @@ Puppet::Network::FormatHandler.create(:b64_zlib_yaml, :mime => "text/b64_zlib_ya yaml end - # Because of yaml issue in ruby 1.8.1... def supported?(klass) - RUBY_VERSION != '1.8.1' and use_zlib? + use_zlib? end # fixup invalid yaml as per: -- 1.7.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
