Skip to content

Commit c7ffb95

Browse files
authored
#775 - Explicitly resolve deferred values
From Puppet Agent v8 onwards, a deferred value needs to be explicitly resolved.
1 parent d3be1ca commit c7ffb95

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/puppet/type/concat_file.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ def nested_merge(hash1, hash2)
296296

297297
def fragment_content(r)
298298
if r[:content].nil? == false
299-
fragment_content = r[:content]
299+
# Explicitly resolve deferred values.
300+
fragment_content = r[:content].instance_of?(Puppet::Pops::Evaluator::DeferredValue) ? r[:content].resolve : r[:content]
300301
elsif r[:source].nil? == false
301302
@source = nil
302303
Array(r[:source]).each do |source|

0 commit comments

Comments
 (0)