X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fjoin.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fjoin.rb;h=d2d7019f2e34afa585f3658a2d6dce506242f519;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=1c179974c85f6bb4ef49de3bd0d2867b84720654;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/join.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/join.rb
index 1c179974c..d2d7019f2 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/join.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/join.rb
@@ -1,21 +1,23 @@
 #
 # join.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:join, :type => :rvalue, :doc => <<-EOS
-This function joins an array into a string using a separator.
+  newfunction(:join, :type => :rvalue, :doc => <<-DOC
+    This function joins an array into a string using a separator.
+
+    *Examples:*
 
-*Examples:*
+        join(['a','b','c'], ",")
 
-    join(['a','b','c'], ",")
+    Would result in: "a,b,c"
 
-Would result in: "a,b,c"
-    EOS
-  ) do |arguments|
+    Note: from Puppet 5.4.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+    DOC
+             ) do |arguments|
 
     # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "join(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "join(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     array = arguments[0]