[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 0cb5e7d226934e74f8b53dc1f6425b47f536afab
Author: Markus Roberts <Markus at reality.com>
Date:   Sun Dec 20 15:10:37 2009 -0800

    Fix for #2943 (Make puppet --apply respect --preferred_serialization_format)
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/puppet.rb
index 6fdd5a0..2929d54 100644
--- a/lib/puppet/application/puppet.rb
+++ b/lib/puppet/application/puppet.rb
@@ -49,7 +49,7 @@ Puppet::Application.new(:puppet) do
         end
 
         begin
-            catalog = PSON.parse(text)
+            catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
             unless catalog.is_a?(Puppet::Resource::Catalog)
                 catalog = Puppet::Resource::Catalog.pson_create(catalog)
             end

-- 
Puppet packaging for Debian