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

[test branch]

The following commit has been merged in the upstream branch:
commit f9254756348e76d557420e18d619dd68775437ae
Author: Luke Kanies <luke at madstop.com>
Date:   Sun Nov 1 15:32:50 2009 -0500

    Fixing file content logs
    
    These were logging 'unknown checksum' unless the files
    had a source specified.
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb
index 032c7c8..0f26a85 100755
--- a/lib/puppet/type/file/content.rb
+++ b/lib/puppet/type/file/content.rb
@@ -39,8 +39,8 @@ module Puppet
         # Checksums need to invert how changes are printed.
         def change_to_s(currentvalue, newvalue)
             # Our "new" checksum value is provided by the source.
-            unless source = resource.parameter(:source) and newvalue = source.checksum
-                newvalue = "unknown checksum"
+            if source = resource.parameter(:source)
+                newvalue = source.checksum || "unknown checksum"
             end
             if currentvalue == :absent
                 return "defined content as '%s'" % [newvalue]

-- 
Puppet packaging for Debian