diff options
| author | José Valim <jose.valim@gmail.com> | 2011-09-29 06:19:26 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-09-29 06:19:26 -0700 |
| commit | 4284e137ab876927b15d593358a157fe077ec238 (patch) | |
| tree | 77a9670f6fa552e0eeea1a9c783c6e992bc8c1ae /railties/lib/rails/generators | |
| parent | 64b0c8888b908ede5372e0a70cb4cb8731d372ba (diff) | |
| parent | 148e4a541361f140f13aa35bb43b3d57c95831d6 (diff) | |
| download | rails-4284e137ab876927b15d593358a157fe077ec238.tar.gz rails-4284e137ab876927b15d593358a157fe077ec238.tar.bz2 rails-4284e137ab876927b15d593358a157fe077ec238.zip | |
Merge pull request #3167 from dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake
RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index 575f4bb106..5af5d3b856 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -252,7 +252,7 @@ module Rails # def rake(command, options={}) log :rake, command - env = options[:env] || 'development' + env = options[:env] || ENV["RAILS_ENV"] || 'development' sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : '' in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) } end |