Skip to content

Commit 7c356ef

Browse files
authored
Merge pull request #705 from ekohl/no-modify-in-place
Do not modify metaparams in place
2 parents 344fe93 + 4f504e0 commit 7c356ef

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/puppet/type/concat_file.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,12 @@ def generate
341341
file_opts[param] = self[param] unless self[param].nil?
342342
end
343343

344-
metaparams = Puppet::Type.metaparams
345344
excluded_metaparams = [:before, :notify, :require, :subscribe, :tag]
346345

347-
metaparams.reject! { |param| excluded_metaparams.include? param }
348-
349-
metaparams.each do |metaparam|
350-
file_opts[metaparam] = self[metaparam] unless self[metaparam].nil?
346+
Puppet::Type.metaparams.each do |metaparam|
347+
unless self[metaparam].nil? || excluded_metaparams.include?(metaparam)
348+
file_opts[metaparam] = self[metaparam]
349+
end
351350
end
352351

353352
[Puppet::Type.type(:file).new(file_opts)]

0 commit comments

Comments
 (0)