This was sometimes causing files to get converted to
directories.
Signed-off-by: Luke Kanies <[email protected]>
---
lib/puppet/type/file.rb | 2 +-
spec/unit/type/file.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 3be96ff..7d37fe8 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -479,7 +479,7 @@ module Puppet
options = @original_parameters.merge(:path => full_path, :implicit
=> true).reject { |param, value| value.nil? }
# These should never be passed to our children.
- [:parent, :ensure, :recurse, :target, :alias].each do |param|
+ [:parent, :ensure, :recurse, :target, :alias, :source].each do
|param|
options.delete(param) if options.include?(param)
end
diff --git a/spec/unit/type/file.rb b/spec/unit/type/file.rb
index 01199d0..2be388f 100755
--- a/spec/unit/type/file.rb
+++ b/spec/unit/type/file.rb
@@ -598,7 +598,7 @@ describe Puppet::Type.type(:file) do
@file.newchild("my/path")
end
- {:recurse => true, :target => "/foo/bar", :ensure => :present,
:alias => "yay"}.each do |param, value|
+ {:recurse => true, :target => "/foo/bar", :ensure => :present,
:alias => "yay", :source => "/foo/bar"}.each do |param, value|
it "should not pass on #{param} to the sub resource" do
@file = Puppet::Type::File.new(:name => @path, param =>
value, :catalog => @catalog)
--
1.6.1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
