summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-05-22 16:12:16 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-05-22 16:12:16 +1000
commit6ea494f383ab51b14238e0b8dcb8925d3faa6c83 (patch)
tree3963725691dc2a100d3ce389a6f68f5685aa1609 /lib/puppet
parentbd51a53b0870ee2355c046af255232ec868d8f1d (diff)
downloadpuppet-6ea494f383ab51b14238e0b8dcb8925d3faa6c83.tar.gz
puppet-6ea494f383ab51b14238e0b8dcb8925d3faa6c83.tar.xz
puppet-6ea494f383ab51b14238e0b8dcb8925d3faa6c83.zip
Pushed patch fixing #1235
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/type/file/target.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/type/file/target.rb b/lib/puppet/type/file/target.rb
index a0e5dc401..8949c2af6 100644
--- a/lib/puppet/type/file/target.rb
+++ b/lib/puppet/type/file/target.rb
@@ -54,6 +54,8 @@ module Puppet
def insync?(currentvalue)
if [:nochange, :notlink].include?(self.should) or @resource.recurse?
return true
+ elsif ! @resource.replace? and File.exists?(@resource[:path])
+ return true
else
return super(currentvalue)
end