summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/enclose_ipv6.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/enclose_ipv6.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/enclose_ipv6.rb')
-rw-r--r--lib/puppet/parser/functions/enclose_ipv6.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
index 80ffc3a..1f8a454 100644
--- a/lib/puppet/parser/functions/enclose_ipv6.rb
+++ b/lib/puppet/parser/functions/enclose_ipv6.rb
@@ -16,12 +16,10 @@ Takes an array of ip addresses and encloses the ipv6 addresses with square brack
end
if (arguments.size != 1) then
- raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
- "given #{arguments.size} for 1")
+ raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments given #{arguments.size} for 1")
end
unless arguments[0].is_a?(String) or arguments[0].is_a?(Array) then
- raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type "+
- "given #{arguments[0].class} expected String or Array")
+ raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type given #{arguments[0].class} expected String or Array")
end
input = [arguments[0]].flatten.compact
@@ -32,8 +30,7 @@ Takes an array of ip addresses and encloses the ipv6 addresses with square brack
begin
ip = IPAddr.new(val)
rescue *rescuable_exceptions
- raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
- "given #{val} is not an ip address.")
+ raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument given #{val} is not an ip address.")
end
val = "[#{ip.to_s}]" if ip.ipv6?
end