summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2011-02-23 13:40:28 -0800
committerJesse Wolfe <jes5199@gmail.com>2011-02-23 13:40:28 -0800
commit7898345acef254ced9316e5a90104609ccb16c2e (patch)
treeee07ee0f4495e08eb132b1731b37ced20f19667a
parent101527b0231bcbad8a9d0d5f2b434c9fcb2b518c (diff)
parente3dfe41ce7da108fc345e58c7df8c1576ea951a0 (diff)
downloadpuppet-7898345acef254ced9316e5a90104609ccb16c2e.tar.gz
puppet-7898345acef254ced9316e5a90104609ccb16c2e.tar.xz
puppet-7898345acef254ced9316e5a90104609ccb16c2e.zip
Merge branch 'ticket/2.6.next/6418' into 2.6.next
-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