diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-11-04 17:57:20 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-11-10 21:58:50 +1100 |
| commit | 136949da70f1a6715734faa6ac3c464f386fccfb (patch) | |
| tree | b0446e2651ba9ee1bf2ab73128d0284a255fb8fc /lib/puppet | |
| parent | cb3e5e10d76a4a0f44e16c5bf36c69b65ae18fbb (diff) | |
| download | puppet-136949da70f1a6715734faa6ac3c464f386fccfb.tar.gz puppet-136949da70f1a6715734faa6ac3c464f386fccfb.tar.xz puppet-136949da70f1a6715734faa6ac3c464f386fccfb.zip | |
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 <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/type/file/content.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |