summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-01 00:12:39 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-01 00:12:39 +0000
commit62ab87309abcbc80d469c68ee210f34f566f42c0 (patch)
tree83523e94f9d157ebcd94b80f8142734340d8862f /lib/puppet
parentc8f38b7fee12eefb2bed00681b4952ac7ad3f14f (diff)
downloadpuppet-62ab87309abcbc80d469c68ee210f34f566f42c0.tar.gz
puppet-62ab87309abcbc80d469c68ee210f34f566f42c0.tar.xz
puppet-62ab87309abcbc80d469c68ee210f34f566f42c0.zip
Deleting the file even if a source is specified, as mentioned by Robert Nickel.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2138 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/type/pfile/source.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/type/pfile/source.rb b/lib/puppet/type/pfile/source.rb
index 77f90bc9f..89a7d1990 100755
--- a/lib/puppet/type/pfile/source.rb
+++ b/lib/puppet/type/pfile/source.rb
@@ -173,7 +173,9 @@ module Puppet
case @stats[:type]
when "directory", "file":
- @parent[:ensure] = @stats[:type]
+ unless @parent.deleting?
+ @parent[:ensure] = @stats[:type]
+ end
else
self.info @stats.inspect
self.err "Cannot use files of type %s as sources" %