summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-29 01:29:20 -0700
committerLuke Kanies <luke@madstop.com>2008-08-29 01:29:20 -0700
commita9b7f0881aed04fbbca59947cab0ffeedda6d2f8 (patch)
tree7d695264173a5491b86ce65f35985e698bb3b859 /lib/puppet
parentb69c50ccd3a491b6c4a8d456af2fe6f9cac45eae (diff)
downloadpuppet-a9b7f0881aed04fbbca59947cab0ffeedda6d2f8.tar.gz
puppet-a9b7f0881aed04fbbca59947cab0ffeedda6d2f8.tar.xz
puppet-a9b7f0881aed04fbbca59947cab0ffeedda6d2f8.zip
As far as I can tell, recursion is working entirely.
W00t! Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-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