diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/file_serving/fileset.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/terminus_helper.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/type/file.rb | 9 | ||||
| -rwxr-xr-x | lib/puppet/type/file/checksum.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/checksums.rb | 5 |
5 files changed, 18 insertions, 4 deletions
diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index 50e4e1e80..a66d9356f 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -9,7 +9,7 @@ require 'puppet/file_serving/metadata' # Operate recursively on a path, returning a set of file paths. class Puppet::FileServing::Fileset attr_reader :path, :ignore, :links - attr_accessor :recurse, :recurselimit + attr_accessor :recurse, :recurselimit, :checksum_type # Produce a hash of files, with merged so that earlier files # with the same postfix win. E.g., /dir1/subfile beats /dir2/subfile. @@ -105,7 +105,7 @@ class Puppet::FileServing::Fileset end def initialize_from_request(request) - [:links, :ignore, :recurse, :recurselimit].each do |param| + [:links, :ignore, :recurse, :recurselimit, :checksum_type].each do |param| if request.options.include?(param) # use 'include?' so the values can be false value = request.options[param] elsif request.options.include?(param.to_s) diff --git a/lib/puppet/file_serving/terminus_helper.rb b/lib/puppet/file_serving/terminus_helper.rb index c88bacc4a..6f5d52b25 100644 --- a/lib/puppet/file_serving/terminus_helper.rb +++ b/lib/puppet/file_serving/terminus_helper.rb @@ -16,6 +16,7 @@ module Puppet::FileServing::TerminusHelper Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path| inst = model.new(base_path, :relative_path => file) + inst.checksum_type = request.options[:checksum_type] if request.options[:checksum_type] inst.links = request.options[:links] if request.options[:links] inst.collect inst diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index 2f5b5dfaf..fdb5a3578 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -592,7 +592,14 @@ module Puppet end def perform_recursion(path) - Puppet::FileServing::Metadata.search(path, :links => self[:links], :recurse => (self[:recurse] == :remote ? true : self[:recurse]), :recurselimit => self[:recurselimit], :ignore => self[:ignore]) + params = { + :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) end # Remove any existing data. This is only used when dealing with diff --git a/lib/puppet/type/file/checksum.rb b/lib/puppet/type/file/checksum.rb index 23a3e5adc..0c45aad32 100755 --- a/lib/puppet/type/file/checksum.rb +++ b/lib/puppet/type/file/checksum.rb @@ -23,7 +23,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do @unmanaged = true - @validtypes = %w{md5 md5lite timestamp mtime time} + @validtypes = %w{md5 md5lite timestamp mtime time none} def self.validtype?(type) @validtypes.include?(type) @@ -52,6 +52,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do cache(type, sum) return type else + return :none if value.nil? or value.to_s == "" or value.to_s == "none" if FileTest.directory?(@resource[:path]) return :time elsif @resource[:source] and value.to_s != "md5" diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb index 98bf5de8f..39477ee2b 100644 --- a/lib/puppet/util/checksums.rb +++ b/lib/puppet/util/checksums.rb @@ -68,6 +68,11 @@ module Puppet::Util::Checksums File.stat(filename).send(:ctime) end + # Return a "no checksum" + def none_file(filename) + "" + end + private # Perform an incremental checksum on a file. |