summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2011-02-22 16:51:39 -0800
committerJacob Helwig <jacob@puppetlabs.com>2011-03-02 15:58:48 -0800
commit63e911f90c0ab9e796b11cd42cc8d339e6c312b3 (patch)
tree8ac6382feca305721bc27f60828a371f9a783ecc /lib
parent0eeeb5159f8c5130ce5090203283cb8ef5d68b94 (diff)
downloadpuppet-63e911f90c0ab9e796b11cd42cc8d339e6c312b3.tar.gz
puppet-63e911f90c0ab9e796b11cd42cc8d339e6c312b3.tar.xz
puppet-63e911f90c0ab9e796b11cd42cc8d339e6c312b3.zip
(#6418) Recursive files shouldn't be audited
A vestigial codepath was accidentally made live again when 2.6.0's audit parameter was added. This patch removes that code. As it's very difficult to write a meaningful unit test of a negative case, a test will be added to the acceptance test project to confirm before & after behavior for this fix. Reviewed-By: Markus Roberts <markus@puppetlabs.com>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/type/file/source.rb14
1 files changed, 0 insertions, 14 deletions
diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb
index bc464e1c3..6dda7957c 100755
--- a/lib/puppet/type/file/source.rb
+++ b/lib/puppet/type/file/source.rb
@@ -132,10 +132,6 @@ module Puppet
end
end
- def pinparams
- [:mode, :type, :owner, :group, :content]
- end
-
def found?
! (metadata.nil? or metadata.ftype.nil?)
end
@@ -161,16 +157,6 @@ module Puppet
result
end
- # Make sure we're also checking the checksum
- def value=(value)
- super
-
- checks = (pinparams + [:ensure])
- checks.delete(:checksum)
-
- resource[:audit] = checks
- end
-
def local?
found? and uri and (uri.scheme || "file") == "file"
end