diff options
| author | jkeiser <jkeiser@opscode.com> | 2013-01-10 19:16:54 -0800 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-06-07 13:12:18 -0700 |
| commit | 725ed0493f02be23c4b5a5556f24edf3579b1cfd (patch) | |
| tree | 309c6f519fe60a6b96bd6a048f1fd3fcd91ca3aa /lib/chef/knife/diff.rb | |
| parent | a6b22d2fcdb4188788d54240ae065a5acc6b4741 (diff) | |
| download | chef-725ed0493f02be23c4b5a5556f24edf3579b1cfd.tar.gz | |
Fix diff output, add diff integration tests
Diffstat (limited to 'lib/chef/knife/diff.rb')
| -rw-r--r-- | lib/chef/knife/diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/diff.rb b/lib/chef/knife/diff.rb index b2d8868892..c59ff22c29 100644 --- a/lib/chef/knife/diff.rb +++ b/lib/chef/knife/diff.rb @@ -35,8 +35,8 @@ class Chef # Get the matches (recursively) patterns.each do |pattern| - Chef::ChefFS::CommandLine.diff(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode) do |diff| - output diff + Chef::ChefFS::CommandLine.diff_print(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, output_mode, proc { |entry| format_path(entry.path) } ) do |diff| + stdout.print diff end end end |