summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-11 21:13:24 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-11 21:13:24 +0000
commitffb7ae0d63a42a5b0443a3994ac48b6e9caf97b2 (patch)
treed10204511a095822cd84ce12d25018c31b8ea0cf
parent79b604d83273ad892d264c64ea03f46d321c7668 (diff)
downloadpuppet-ffb7ae0d63a42a5b0443a3994ac48b6e9caf97b2.tar.gz
puppet-ffb7ae0d63a42a5b0443a3994ac48b6e9caf97b2.tar.xz
puppet-ffb7ae0d63a42a5b0443a3994ac48b6e9caf97b2.zip
Fixing #660 by applying patch by freiheit. Looks like this is another problem with yaml on 1.8.1.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2560 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/network/handler/master.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 963b7841a..304f1f88d 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -203,7 +203,8 @@ class Puppet::Network::Handler
when "marshal":
str = Marshal::dump(retobjects)
when "yaml":
- str = YAML.dump(retobjects)
+ #str = YAML.dump(retobjects)
+ str = retobjects.to_yaml(:UseBlock => true)
else
raise XMLRPC::FaultException.new(
1, "Unavailable config format %s" % format