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 <[email protected]>
Signed-off-by: Jesse Wolfe <[email protected]>
---
 lib/puppet/type/file/source.rb |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

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
-- 
1.7.3.5

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to