diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2013-07-03 14:31:07 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2013-07-03 14:31:07 -0700 |
| commit | 4f206a76d8fe30e29156bbe50d54bc701d23c0b8 (patch) | |
| tree | de358f4d9b84501f4e39b9f19860783524eadc16 | |
| parent | 801c06950fb0c5d87a91b4afc887e765b4311792 (diff) | |
| parent | ac754c30552b999c19784d2d402a6f3503d7ddef (diff) | |
| download | chef-4f206a76d8fe30e29156bbe50d54bc701d23c0b8.tar.gz | |
Merge pull request #874 from opscode/diff-solaris-rspec-fix
this should have been reverted to old behavior, causes failures on
| -rw-r--r-- | lib/chef/util/diff.rb | 1 | ||||
| -rw-r--r-- | spec/unit/util/diff_spec.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/util/diff.rb b/lib/chef/util/diff.rb index ba8ef69203..6f76a2fabd 100644 --- a/lib/chef/util/diff.rb +++ b/lib/chef/util/diff.rb @@ -115,6 +115,7 @@ class Chef diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?') end @diff = diff_str.split("\n") + @diff.delete("\\ No newline at end of file") return "(diff available)" end elsif !result.stderr.empty? diff --git a/spec/unit/util/diff_spec.rb b/spec/unit/util/diff_spec.rb index 47d9b27a02..2dadb5be56 100644 --- a/spec/unit/util/diff_spec.rb +++ b/spec/unit/util/diff_spec.rb @@ -364,7 +364,7 @@ describe Chef::Util::Diff, :uses_diff => true do end it "calling for_output should return a unified diff" do - differ.for_output.size.should eql(7) + differ.for_output.size.should eql(5) differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m) end |