Merge commit 'davids-bugfixes/rest/tests-for-872'

1 files changed, 6 insertions, 0 deletions

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)