summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-06 14:59:32 -0600
committerLuke Kanies <luke@madstop.com>2008-03-06 14:59:32 -0600
commitdade15302f899b75426b6e32dd4b1aa2371bf4fc (patch)
treee495aef0b1f5f9e70211a60a16377afd97be2a3a
parent35214eb7e2887ed4ab7e4ab0d8c92c724db495d2 (diff)
parenteecc22c52dceeccca148e543336a6cd7d64498e6 (diff)
downloadpuppet-dade15302f899b75426b6e32dd4b1aa2371bf4fc.tar.gz
puppet-dade15302f899b75426b6e32dd4b1aa2371bf4fc.tar.xz
puppet-dade15302f899b75426b6e32dd4b1aa2371bf4fc.zip
Merge commit 'shadoi/fix1116' into 0.24.x
-rwxr-xr-xlib/puppet/type/file/checksum.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/type/file/checksum.rb b/lib/puppet/type/file/checksum.rb
index debb5a7db..3be147cb7 100755
--- a/lib/puppet/type/file/checksum.rb
+++ b/lib/puppet/type/file/checksum.rb
@@ -66,6 +66,9 @@ Puppet::Type.type(:file).newproperty(:checksum) do
raise ArgumentError, "A type must be specified to cache a checksum"
end
type = symbolize(type)
+ type = :mtime if type == :timestamp
+ type = :ctime if type == :time
+
unless state = @resource.cached(:checksums)
self.debug "Initializing checksum hash"
state = {}