diff options
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/puppet.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/application/puppetmasterd.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/puppet.rb index a87ae488f..6fdd5a0c6 100644 --- a/lib/puppet/application/puppet.rb +++ b/lib/puppet/application/puppet.rb @@ -49,12 +49,12 @@ Puppet::Application.new(:puppet) do end begin - catalog = JSON.parse(text) + catalog = PSON.parse(text) unless catalog.is_a?(Puppet::Resource::Catalog) - catalog = Puppet::Resource::Catalog.json_create(catalog) + catalog = Puppet::Resource::Catalog.pson_create(catalog) end rescue => detail - raise Puppet::Error, "Could not deserialize catalog from json: %s" % detail + raise Puppet::Error, "Could not deserialize catalog from pson: %s" % detail end catalog = catalog.to_ral diff --git a/lib/puppet/application/puppetmasterd.rb b/lib/puppet/application/puppetmasterd.rb index 40bc30663..9b0bf30ce 100644 --- a/lib/puppet/application/puppetmasterd.rb +++ b/lib/puppet/application/puppetmasterd.rb @@ -53,13 +53,13 @@ Puppet::Application.new(:puppetmasterd) do command(:compile) do Puppet::Util::Log.newdestination :console - raise ArgumentError, "Cannot render compiled catalogs without json support" unless Puppet.features.json? + raise ArgumentError, "Cannot render compiled catalogs without pson support" unless Puppet.features.pson? begin unless catalog = Puppet::Resource::Catalog.find(options[:node]) raise "Could not compile catalog for %s" % options[:node] end - $stdout.puts catalog.render(:json) + $stdout.puts catalog.render(:pson) rescue => detail $stderr.puts detail exit(30) |