[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit e3dfe41ce7da108fc345e58c7df8c1576ea951a0
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Feb 22 16:51:39 2011 -0800

    (#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 at puppetlabs.com>

diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb
index bc464e1..6dda795 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

-- 
Puppet packaging for Debian