diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-20 15:10:37 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-21 17:56:22 +1100 |
| commit | 0cb5e7d226934e74f8b53dc1f6425b47f536afab (patch) | |
| tree | 0ed1caeaaf4b71ca6f591696325d426275108a6d /lib/puppet | |
| parent | 08840356c88c2478f523189e668eb96e410e27e6 (diff) | |
| download | puppet-0cb5e7d226934e74f8b53dc1f6425b47f536afab.tar.gz puppet-0cb5e7d226934e74f8b53dc1f6425b47f536afab.tar.xz puppet-0cb5e7d226934e74f8b53dc1f6425b47f536afab.zip | |
Fix for #2943 (Make puppet --apply respect --preferred_serialization_format)
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/application/puppet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/puppet.rb index 6fdd5a0c6..2929d54e8 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 |