X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fjoin_keys_to_values.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fjoin_keys_to_values.rb;h=d8966bac7af32903ef41f4541d476346ce1e3be8;hb=6963202b4b62c2816655ac9532521b018fdf83bd;hp=e9924fe2e6356e7edd24a2cd391bd159460bca9e;hpb=a69999e580f8b3abd12446c2d6ad59e517651813;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
index e9924fe2e..d8966bac7 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
@@ -5,7 +5,8 @@
 module Puppet::Parser::Functions
   newfunction(:join_keys_to_values, :type => :rvalue, :doc => <<-EOS
 This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
+separator. Keys are cast to strings. If values are arrays, multiple keys
+are added for each element. The return value is an array in
 which each element is one joined key/value pair.
 
 *Examples:*
@@ -13,33 +14,38 @@ which each element is one joined key/value pair.
     join_keys_to_values({'a'=>1,'b'=>2}, " is ")
 
 Would result in: ["a is 1","b is 2"]
+
+    join_keys_to_values({'a'=>1,'b'=>[2,3]}, " is ")
+
+Would result in: ["a is 1","b is 2","b is 3"]
     EOS
   ) do |arguments|
 
     # Validate the number of arguments.
     if arguments.size != 2
-      raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two " +
-            "arguments, but #{arguments.size} given.")
+      raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two arguments, but #{arguments.size} given.")
     end
 
     # Validate the first argument.
     hash = arguments[0]
     if not hash.is_a?(Hash)
-      raise(TypeError, "join_keys_to_values(): The first argument must be a " +
-            "hash, but a #{hash.class} was given.")
+      raise(TypeError, "join_keys_to_values(): The first argument must be a hash, but a #{hash.class} was given.")
     end
 
     # Validate the second argument.
     separator = arguments[1]
     if not separator.is_a?(String)
-      raise(TypeError, "join_keys_to_values(): The second argument must be a " +
-            "string, but a #{separator.class} was given.")
+      raise(TypeError, "join_keys_to_values(): The second argument must be a string, but a #{separator.class} was given.")
     end
 
     # Join the keys to their values.
     hash.map do |k,v|
-      String(k) + separator + String(v)
-    end
+      if v.is_a?(Array)
+        v.map { |va| String(k) + separator + String(va) }
+      else
+        String(k) + separator + String(v)
+      end
+    end.flatten
 
   end
 end