From 136949da70f1a6715734faa6ac3c464f386fccfb Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Wed, 4 Nov 2009 17:57:20 -0800 Subject: Fixing #2631 show_diff sometimes doesn't happen This patch fixes a code-path in Puppet::Type::File::Content#insync? that was failing to show a diff when the content's source came from a template. I was only able to reproduce one of the two such failures that Malcolm Howe reported, but I think it's likely that they were both caused by this same bug. Signed-off-by: Jesse Wolfe --- lib/puppet/type/file/content.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb index 7f1908394..36e6c4172 100755 --- a/lib/puppet/type/file/content.rb +++ b/lib/puppet/type/file/content.rb @@ -96,7 +96,7 @@ module Puppet return true if ! @resource.replace? if self.should - return super + result = super elsif source = resource.parameter(:source) fail "Got a remote source with no checksum" unless source.checksum result = (is == source.checksum) -- cgit