From 37d51b9bbf67378f5fe858b6e002b5d938bed711 Mon Sep 17 00:00:00 2001 From: Sean Millichamp Date: Sat, 22 Jul 2023 16:59:41 -0400 Subject: [PATCH] Re-add block support to deprecated top-level merge --- lib/puppet/functions/merge.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/puppet/functions/merge.rb b/lib/puppet/functions/merge.rb index 5d4f5c951..da42d9c92 100644 --- a/lib/puppet/functions/merge.rb +++ b/lib/puppet/functions/merge.rb @@ -6,9 +6,10 @@ Puppet::Functions.create_function(:merge) do dispatch :deprecation_gen do repeated_param 'Any', :args + optional_block_param 'Variant[Callable[2,2], Callable[3,3]]', :block end - def deprecation_gen(*args) + def deprecation_gen(*args, &block) call_function('deprecation', 'merge', 'This function is deprecated, please use stdlib::merge instead.', false) - call_function('stdlib::merge', *args) + call_function('stdlib::merge', *args, &block) end end