summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/union.rb
diff options
context:
space:
mode:
authorEric Putnam <putnam.eric@gmail.com>2017-02-28 15:31:36 -0800
committerEric Putnam <putnam.eric@gmail.com>2017-03-01 11:26:06 -0800
commite2a8690fa6a41e481ae14e9642f4f5efeaa2d681 (patch)
tree2207aafabf7082df595ca2221aabf5e246c9dea1 /lib/puppet/parser/functions/union.rb
parent2e3b87f4ffafe5eb4d0a37d11e4f63fbbed0dd63 (diff)
(MODULES-4473) join strings for i18n parser
This commit joins all strings that are split over two lines with a plus, backslash, or double less than so that our magical i18n parser can wave over the module and mark every ruby string with our i18n function.
Diffstat (limited to 'lib/puppet/parser/functions/union.rb')
-rw-r--r--lib/puppet/parser/functions/union.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/union.rb b/lib/puppet/parser/functions/union.rb
index 6c5bb83..abe2dc8 100644
--- a/lib/puppet/parser/functions/union.rb
+++ b/lib/puppet/parser/functions/union.rb
@@ -15,8 +15,7 @@ Would return: ["a","b","c","d"]
) do |arguments|
# Check that 2 or more arguments have been given ...
- raise(Puppet::ParseError, "union(): Wrong number of arguments " +
- "given (#{arguments.size} for < 2)") if arguments.size < 2
+ raise(Puppet::ParseError, "union(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
arguments.each do |argument|
raise(Puppet::ParseError, 'union(): Every parameter must be an array') unless argument.is_a?(Array)