diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-20 14:08:48 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-20 14:08:48 -0500 |
| commit | a240969763e531a5a1cbcd0fd1c07319deb8edb8 (patch) | |
| tree | 0f9a7588b1a43219b0c3564c1a617049d4541e8b | |
| parent | e00065a8e63a7222eacbc7e8aaa925e967fd5c60 (diff) | |
| download | puppet-a240969763e531a5a1cbcd0fd1c07319deb8edb8.tar.gz puppet-a240969763e531a5a1cbcd0fd1c07319deb8edb8.tar.xz puppet-a240969763e531a5a1cbcd0fd1c07319deb8edb8.zip | |
Applying patch by wyvern to fix #1142.
| -rw-r--r-- | lib/puppet/util/diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb index e6ff57108..f37ea0850 100644 --- a/lib/puppet/util/diff.rb +++ b/lib/puppet/util/diff.rb @@ -27,7 +27,7 @@ module Puppet::Util::Diff output = "" - diffs = Diff::LCS.diff(data_old, data_new) + diffs = ::Diff::LCS.diff(data_old, data_new) return output if diffs.empty? oldhunk = hunk = nil @@ -35,7 +35,7 @@ module Puppet::Util::Diff diffs.each do |piece| begin - hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, + hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines, file_length_difference) file_length_difference = hunk.file_length_difference |