aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index c0d5fbd4d6..dbb76c3e85 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -11,7 +11,7 @@ class AppGenerator < Rails::Generator::Base
super
usage if args.empty?
@destination_root = args.shift
- @socket = `mysql_config --socket`.strip
+ @socket = `mysql_config --socket`.strip rescue nil
@socket = '/path/to/your/mysql.sock' if @socket.blank?
end