diff options
| author | Markus Roberts <Markus@reality.com> | 2010-09-30 17:21:56 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-09-30 17:21:56 -0700 |
| commit | bdf12fec365151fb049f7875aa82f2d207f0d8a0 (patch) | |
| tree | 638b7393ba37c63d813092427f5cd07342763b85 /lib | |
| parent | e7424c69822a91360c94469dfef4ccddda7f6d25 (diff) | |
| download | puppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.tar.gz puppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.tar.xz puppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/zaml.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/util/zaml.rb b/lib/puppet/util/zaml.rb index 8ecc2c8bd..64c58f9a3 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 |