diff options
author | Markus Roberts <Markus@reality.com> | 2010-03-21 21:14:12 -0700 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 40c1fb06162f2eebe6cd5e40a0e289cd568ec8e1 (patch) | |
tree | 0023db2b31edb467457a24c0b00b18f5b5e21b46 /lib | |
parent | 105937041138694854904b7c5e23fdd2bd8af6d3 (diff) | |
download | puppet-40c1fb06162f2eebe6cd5e40a0e289cd568ec8e1.tar.gz puppet-40c1fb06162f2eebe6cd5e40a0e289cd568ec8e1.tar.xz puppet-40c1fb06162f2eebe6cd5e40a0e289cd568ec8e1.zip |
Resolving conflicts with ???
When checksum is a parameter corresponding to checksum_type in the filesets
rather than a checksum "strategy" the value :none should generally be computed
rather than provided. If neither a source nor contents are provided, there is
no need for a checksum and thus it should be :none; otherwise, use the provided
value (or, if it's nil, let it pass through and be replaced by the default
(:md5) in the bowels of the beast).
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/type/file.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index efac1c835..8a21aa3f7 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -601,14 +601,14 @@ Puppet::Type.newtype(:file) do end def perform_recursion(path) - params = { + Puppet::FileServing::Metadata.search( + path, :links => self[:links], :recurse => (self[:recurse] == :remote ? true : self[:recurse]), :recurselimit => self[:recurselimit], - :ignore => self[:ignore] - } - params[:checksum_type] = self[:checksum] if self[:checksum] == :none - Puppet::FileServing::Metadata.search(path, params) + :ignore => self[:ignore], + :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none + ) end # Remove any existing data. This is only used when dealing with |