summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/type/file.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index ce1df1c35..543b0710e 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -563,7 +563,7 @@ module Puppet
full_path = File.join(self[:path], path)
# the right-side hash wins in the merge.
- options = to_hash.merge(:path => full_path, :implicit => true)
+ options = to_hash.merge(:path => full_path, :implicit => true).reject { |param, value| value.nil? }
[:parent, :recurse, :target].each do |param|
options.delete(param) if options.include?(param)
end