[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.4-89-gcbbd363

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 9d3e98b8cb2b980b61f3cd17af471f2e9d04841f
Author: Markus Roberts <Markus at reality.com>
Date:   Thu May 13 13:08:46 2010 -0700

    Minimal footprint fix for #3751 (serialization 0.25.5 <-> 0.24.8)
    
    The problem was caused by a conflict between our yaml post processing
    (which expects the malformed output of the standard library's yaml
    class) and zaml (which produces the right output).
    
    This patch implements the minimal footprint solution.  It just causes
    zaml to always escape \r and \n, so that the fixups won't be triggered
    and the results will be properly interpreted by any version of puppet.
    
    For Rowlf, this patch should NOT be used, and instead the fix for #3766
    (actually rooting out and removing the vestigial fixups) should be used.
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/lib/puppet/util/zaml.rb b/lib/puppet/util/zaml.rb
index dcf0e19..22045e1 100644
--- a/lib/puppet/util/zaml.rb
+++ b/lib/puppet/util/zaml.rb
@@ -234,7 +234,7 @@ class String
                     (self =~ /\s$/) or
                     (self =~ /^[>|][-+\d]*\s/i) or
                     (self[-1..-1] =~ /\s/) or 
-                    (self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/) or
+                    (self =~ /[\x00-\x08\x0A-\x1F\x80-\xFF]/) or
                     (self =~ /[,\[\]\{\}\r\t]|:\s|\s#/) or 
                     (self =~ /\A([-:?!#&*'"]|<<|%.+:.)/) 
                     )

-- 
Puppet packaging for Debian