commit bdf12fec365151fb049f7875aa82f2d207f0d8a0
Author: Markus Roberts <[email protected]>
Date: Thu Sep 30 17:21:56 2010 -0700
Fix for #4896 -- stray newline left over from removed diagnostic
A newline that was part of a diagnostic was left in, and this
caused problems
with the serialization of strings in "preserve newlines" mode.
diff --git a/lib/puppet/util/zaml.rb b/lib/puppet/util/zaml.rb
index 8ecc2c8..64c58f9 100644
--- a/lib/puppet/util/zaml.rb
+++ b/lib/puppet/util/zaml.rb
@@ -243,7 +243,6 @@ class String
when self =~ /\n/
if self[-1..-1] == "\n" then z.emit('|+') else z.emit('|-') end
z.nested { split("\n",-1).each { |line| z.nl;
z.emit(line.chomp("\n")) } }
- z.nl
else
z.emit(self)
end
--
-----------------------------------------------------------
The power of accurate observation is
commonly called cynicism by those
who have not got it. ~George Bernard Shaw
------------------------------------------------------------
--
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.
