diff options
Diffstat (limited to 'lib/chef/provider')
| -rw-r--r-- | lib/chef/provider/file.rb | 7 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index 7f85085eeb..84bb4d1c94 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -344,7 +344,7 @@ class Chef end def do_validate_content - if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum ) + if new_resource.checksum && tempfile && ( new_resource.checksum.downcase != tempfile_checksum ) raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum)) end @@ -462,11 +462,6 @@ class Chef @tempfile ||= content.tempfile end - def short_cksum(checksum) - return "none" if checksum.nil? - checksum.slice(0, 6) - end - def load_resource_attributes_from_file(resource) if Chef::Platform.windows? # This is a work around for CHEF-3554. diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index 753d3c279e..b11bcf5192 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -250,7 +250,7 @@ class Chef def validate_content! if new_resource.checksum source_checksum = checksum(source_location) - if new_resource.checksum != source_checksum + if new_resource.checksum.downcase != source_checksum raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(source_checksum)) end end |