From bfa4d558eca86b52eeb4b7e2b00c6dfc50c12fa8 Mon Sep 17 00:00:00 2001 From: Thomas Heinen Date: Mon, 17 Aug 2020 16:27:37 +0200 Subject: Simplify implementation for checksum ellipsis Signed-off-by: Thomas Heinen --- lib/chef/exceptions.rb | 2 +- lib/chef/mixin/checksum.rb | 4 ---- lib/chef/provider/file.rb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb index 444fe82df1..52a2cc8439 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -423,7 +423,7 @@ class Chef class ChecksumMismatch < RuntimeError def initialize(res_cksum, cont_cksum) - super "Checksum on resource (#{res_cksum}) does not match checksum on content (#{cont_cksum})" + super "Checksum on resource (#{res_cksum}...) does not match checksum on content (#{cont_cksum}...)" end end diff --git a/lib/chef/mixin/checksum.rb b/lib/chef/mixin/checksum.rb index 9fb3e13899..083e524d63 100644 --- a/lib/chef/mixin/checksum.rb +++ b/lib/chef/mixin/checksum.rb @@ -31,10 +31,6 @@ class Chef checksum.slice(0, 6) end - - def short_cksum_ellipsis(checksum) - short_cksum(checksum) + "..." - end end end end diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index 394662eed9..0de620bba1 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -335,7 +335,7 @@ class Chef def do_validate_content if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum ) - raise Chef::Exceptions::ChecksumMismatch.new(short_cksum_ellipsis(new_resource.checksum), short_cksum_ellipsis(tempfile_checksum)) + raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum)) end if tempfile -- cgit v1.2.1