+1 works here On Fri, May 14, 2010 at 4:18 AM, Markus Roberts <[email protected]> wrote:
> 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 <[email protected]> > --- > lib/puppet/util/zaml.rb | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > 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([-:?!#&*'"]|<<|%.+:.)/) > ) > -- > 1.6.4 > > -- > 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]<puppet-dev%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. > > -- 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.
