diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-10-13 18:13:22 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-10-13 18:13:22 +0000 |
| commit | 634da0f0102693fbb034b3b7b17808fa5afeb66a (patch) | |
| tree | 1278f71525a4c3d1efb4d5e90d40483cdadd93e0 /railties/lib/commands | |
| parent | 4b72a4b12fbb33d32ae3f9b9d004ca5888d42d58 (diff) | |
| download | rails-634da0f0102693fbb034b3b7b17808fa5afeb66a.tar.gz rails-634da0f0102693fbb034b3b7b17808fa5afeb66a.tar.bz2 rails-634da0f0102693fbb034b3b7b17808fa5afeb66a.zip | |
Fix script/server to use the environment given by the -e toggle
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands')
| -rw-r--r-- | railties/lib/commands/server.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index d21e91f980..375fb4df07 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -47,6 +47,8 @@ ARGV.options do |opts| end ENV["RAILS_ENV"] = OPTIONS[:environment] +RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV) + require RAILS_ROOT + "/config/environment" require 'webrick_server' |