From e3dfe41ce7da108fc345e58c7df8c1576ea951a0 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Tue, 22 Feb 2011 16:51:39 -0800 Subject: (#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 --- lib/puppet/type/file/source.rb | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'lib') 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 -- cgit