[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-98-gf19c0e5

[Luke Kanies]

The following commit has been merged in the master branch:
commit 25a3f59be4a514629db6825ce4b5abb99371ae3e
Author: Luke Kanies <luke at madstop.com>
Date:   Fri Feb 20 09:45:42 2009 -0600

    Fixing #558 - File checksums no longer refer to 'nosum'
    
    It was only used in a method that apparently was not
    in use any more.
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/type/file/checksum.rb b/lib/puppet/type/file/checksum.rb
index 785ed0f..f681a8e 100755
--- a/lib/puppet/type/file/checksum.rb
+++ b/lib/puppet/type/file/checksum.rb
@@ -37,11 +37,6 @@ Puppet::Type.type(:file).newproperty(:checksum) do
         handlesum()
     end
 
-    newvalue(:nosum) do
-        # nothing
-        :nochange
-    end
-
     # If they pass us a sum type, behave normally, but if they pass
     # us a sum type + sum, stick the sum in the cache.
     munge do |value|
@@ -129,35 +124,6 @@ Puppet::Type.type(:file).newproperty(:checksum) do
         cache(checktype())
     end
 
-    # Retrieve the cached sum
-    def getcachedsum
-        hash = nil
-        unless hash = @resource.cached(:checksums) 
-            hash = {}
-            @resource.cache(:checksums, hash)
-        end
-
-        sumtype = self.should
-
-        if hash.include?(sumtype)
-            #self.notice "Found checksum %s for %s" %
-            #    [hash[sumtype] , at resource[:path]]
-            sum = hash[sumtype]
-
-            unless sum =~ /^\{\w+\}/
-                sum = "{%s}%s" % [sumtype, sum]
-            end
-            return sum
-        elsif hash.empty?
-            #self.notice "Could not find sum of type %s" % sumtype
-            return :nosum
-        else
-            #self.notice "Found checksum for %s but not of type %s" %
-            #    [@resource[:path],sumtype]
-            return :nosum
-        end
-    end
-
     # Calculate the sum from disk.
     def getsum(checktype, file = nil)
         sum = ""

-- 
Puppet packaging for Debian