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

[James Turnbull]

The following commit has been merged in the upstream branch:
commit f6046abcb44b99d1385462f4576f180184e3154e
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Apr 19 11:04:32 2010 -0700

    Fix for #3577 -- to_yaml parameter in 0.25.5rc1
    
    The new to_yaml method doesn't take format arguments (as they are
    unnneeded).
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index e21e1e6..3b51822 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -66,7 +66,7 @@ class Puppet::Network::Handler
 
             case format
             when "yaml"
-                return CGI.escape(catalog.extract.to_yaml(:UseBlock => true))
+                return CGI.escape(catalog.extract.to_yaml)
             when "marshal"
                 return CGI.escape(Marshal.dump(catalog.extract))
             else

-- 
Puppet packaging for Debian