[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 3eaf69c4cedeb452f88b0d9e27d12dcdba7e7c22
Author: Markus Roberts <Markus at reality.com>
Date:   Tue May 18 11:27:50 2010 -0700

    Fix for conflict between fileserving streams and none-checksums
    
    This was a classic semantic merge conflict; one patch adds a new type of
    checksum, with a routine to compute it on files; the other adds streams with
    routines to compute all the existing checksum types on them.  They merge
    cleanly but theresult is incorrect.
    
    This patch completes the square by adding a none_stream routine to not-compute
    a checksum on a stream.

diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb
index e534fb0..a095237 100644
--- a/lib/puppet/util/checksums.rb
+++ b/lib/puppet/util/checksums.rb
@@ -103,6 +103,10 @@ module Puppet::Util::Checksums
         ""
     end
 
+    def none_stream
+        ""
+    end
+
     private
 
     # Perform an incremental checksum on a file.

-- 
Puppet packaging for Debian