5639828bff
Psych::SyntaxError is a RuntimeException. This still needs to catch that. This was uncovered by the recent move to catch StandardError rather than the catchall Exception that was here before.
33 lines
899 B
Ruby
33 lines
899 B
Ruby
#
|
|
# parseyaml.rb
|
|
#
|
|
|
|
module Puppet::Parser::Functions
|
|
newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
|
|
This function accepts YAML as a string and converts it into the correct
|
|
Puppet structure.
|
|
|
|
The optional second argument can be used to pass a default value that will
|
|
be returned if the parsing of YAML string have failed.
|
|
EOS
|
|
) do |arguments|
|
|
raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
|
|
require 'yaml'
|
|
|
|
begin
|
|
YAML::load(arguments[0]) || arguments[1]
|
|
# in ruby 1.9.3 Psych::SyntaxError is a RuntimeException
|
|
# this still needs to catch that and work also on rubies that
|
|
# do not have Psych available.
|
|
rescue StandardError, Psych::SyntaxError => e
|
|
if arguments[1]
|
|
arguments[1]
|
|
else
|
|
raise e
|
|
end
|
|
end
|
|
|
|
end
|
|
end
|
|
|
|
# vim: set ts=2 sw=2 et :
|