From c41d369d939673914d27a0a4063eb265938e9968 Mon Sep 17 00:00:00 2001 From: Carl Porth Date: Tue, 27 May 2008 14:21:01 -0700 Subject: [PATCH] Quoted file paths for diff command in Rails::Generator::Commands::Base#force_file_collision?. --- railties/lib/rails_generator/commands.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 03b7d35..978cee1 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -88,7 +88,7 @@ module Rails Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp| temp.write render_file(src, file_options, &block) temp.rewind - $stdout.puts `#{diff_cmd} #{dst} #{temp.path}` + $stdout.puts `#{diff_cmd} "#{dst}" "#{temp.path}"` end puts "retrying" raise 'retry diff' -- 1.5.5.1