projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update stdlib
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
puppet
/
parser
/
functions
/
parsejson.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
index
a9a16a4
..
f7c2896
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
@@
-4,20
+4,25
@@
module Puppet::Parser::Functions
newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
module Puppet::Parser::Functions
newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
- EOS
+This function accepts JSON 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|
) do |arguments|
+ raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
- if (arguments.size != 1) then
- raise(Puppet::ParseError, "parsejson(): Wrong number of arguments "+
- "given #{arguments.size} for 1")
+ begin
+ PSON::load(arguments[0]) || arguments[1]
+ rescue StandardError => e
+ if arguments[1]
+ arguments[1]
+ else
+ raise e
+ end
end
end
- json = arguments[0]
-
- # PSON is natively available in puppet
- PSON.load(json)
end
end
end
end