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
/
concat.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
index
618e62d
..
0a49cfe
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
@@
-17,8
+17,7
@@
Would result in:
) do |arguments|
# Check that more than 2 arguments have been given ...
) do |arguments|
# Check that more than 2 arguments have been given ...
- raise(Puppet::ParseError, "concat(): Wrong number of arguments " +
- "given (#{arguments.size} for < 2)") if arguments.size < 2
+ raise(Puppet::ParseError, "concat(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
a = arguments[0]
a = arguments[0]
@@
-31,7
+30,7
@@
Would result in:
arguments.shift
arguments.each do |x|
arguments.shift
arguments.each do |x|
- result = result +
Array(x
)
+ result = result +
(x.is_a?(Array) ? x : [x]
)
end
return result
end
return result