diff options
| author | Markus Roberts <Markus@reality.com> | 2010-05-18 11:27:50 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 3eaf69c4cedeb452f88b0d9e27d12dcdba7e7c22 (patch) | |
| tree | 206c4d8c87ffb0f77d14a5afaabe3b1674ab74ae /lib | |
| parent | 2cf7222df889981313c6955cc9220ce160dd90f6 (diff) | |
| download | puppet-3eaf69c4cedeb452f88b0d9e27d12dcdba7e7c22.tar.gz puppet-3eaf69c4cedeb452f88b0d9e27d12dcdba7e7c22.tar.xz puppet-3eaf69c4cedeb452f88b0d9e27d12dcdba7e7c22.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/checksums.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb index e534fb0fb..a09523740 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. |