From 445c29c4b108e04b3f077316b36ba50284a7d5d5 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Fri, 9 Nov 2007 19:25:09 +0100 Subject: fix #872: improve property(:content).insync? This commit applies ctrlaltdel's patch from trac #872 --- lib/puppet/type/pfile/content.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/puppet') diff --git a/lib/puppet/type/pfile/content.rb b/lib/puppet/type/pfile/content.rb index 11458ef18..6dcda0aa6 100755 --- a/lib/puppet/type/pfile/content.rb +++ b/lib/puppet/type/pfile/content.rb @@ -33,7 +33,13 @@ module Puppet end # Override this method to provide diffs if asked for. + # Also, fix #872: when content is used, and replace is true, the file + # should be insync when it exists def insync?(is) + if ! @resource.replace? and File.exists?(@resource[:path]) + return true + end + result = super if ! result and Puppet[:show_diff] and File.exists?(@resource[:path]) string_file_diff(@resource[:path], self.should) -- cgit