[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit 404bdfa15aae89b813ec1d86d6b5d20cae345dff
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Apr 9 14:39:45 2010 -0700

    Repair validate_checksum codepath, even though it is disabled.

diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 8a21aa3..5b41538 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -744,7 +744,7 @@ Puppet::Type.newtype(:file) do
         # And put our new file in place
         if use_temporary_file # This is only not true when our file is empty.
             begin
-                fail_if_checksum_is_wrong(path, content) if validate
+                fail_if_checksum_is_wrong(path, content) if validate_checksum?
                 File.rename(path, self[:path])
             rescue => detail
                 fail "Could not rename temporary file %s to %s : %s" % [path, self[:path], detail]
@@ -761,6 +761,10 @@ Puppet::Type.newtype(:file) do
 
     private
 
+    def validate_checksum?
+        false
+    end
+
     # Make sure the file we wrote out is what we think it is.
     def fail_if_checksum_is_wrong(path, checksum)
         # Use the appropriate checksum type -- md5, md5lite, etc.

-- 
Puppet packaging for Debian