Skip to content

Commit 721a6ac

Browse files
authored
Merge pull request #804 from puppetlabs/CAT-1692-compatibility-fix
(CAT-1692) - Compatibility fix with puppet 7.14
2 parents 5e19abc + ab51760 commit 721a6ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/puppet/type/concat_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def nested_merge(hash1, hash2)
297297
def fragment_content(r)
298298
if r[:content].nil? == false
299299
# Explicitly resolve deferred values.
300-
fragment_content = r[:content].instance_of?(Puppet::Pops::Evaluator::DeferredValue) ? r[:content].resolve : r[:content]
300+
fragment_content = r[:content].respond_to?(:resolve) ? r[:content].resolve : r[:content]
301301
elsif r[:source].nil? == false
302302
@source = nil
303303
Array(r[:source]).each do |source|

0 commit comments

Comments
 (0)