aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_generator
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-10-17 04:56:27 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-10-17 04:56:27 +0000
commit2c64b9d1270b0ef468f13152c9acd68e0bb49fd6 (patch)
tree0ffaf99ee9792764955c560458366077c31fe7bf /railties/lib/rails_generator
parentff8fe662ef6ecdde8867b553cb5b60a23a93c152 (diff)
downloadrails-2c64b9d1270b0ef468f13152c9acd68e0bb49fd6.tar.gz
rails-2c64b9d1270b0ef468f13152c9acd68e0bb49fd6.tar.bz2
rails-2c64b9d1270b0ef468f13152c9acd68e0bb49fd6.zip
suppress mysql_config errors
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2664 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator')
-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