Make sure ENV['RAILS_ENV'] and RAILS_ENV are kept in sync

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2539 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck
2005-10-12 12:44:03 +00:00
parent 42bcbcb043
commit de42f26df7

View File

@@ -20,11 +20,8 @@ ARGV.options do |opts|
opts.parse!
end
if defined?(RAILS_ENV)
RAILS_ENV.replace(options[:environment])
else
ENV["RAILS_ENV"] = options[:environment]
end
ENV["RAILS_ENV"] = options[:environment]
RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
require RAILS_ROOT + '/config/environment'
eval(ARGV.first)