Permalink
Browse files

Merge pull request #4352 from kennyj/improve_3694-2

[3-2-stable] Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all.
  • Loading branch information...
2 parents 6005736 + 2056744 commit a579d4bb5f1ec1166762f9365c5e3bb2c49225dd @josevalim josevalim committed Jan 6, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/lib/sprockets/assets.rake
@@ -1,12 +1,12 @@
require "fileutils"
namespace :assets do
- def ruby_rake_task(task)
+ def ruby_rake_task(task, fork = true)
env = ENV['RAILS_ENV'] || 'production'
groups = ENV['RAILS_GROUPS'] || 'assets'
args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
args << "--trace" if Rake.application.options.trace
- ruby(*args)
+ fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args)
end
# We are currently running with no explicit bundler group
@@ -59,7 +59,7 @@ namespace :assets do
# required in order to compile digestless assets as the
# environment has already cached the assets on the primary
# run.
- ruby_rake_task "assets:precompile:nondigest" if Rails.application.config.assets.digest
+ ruby_rake_task("assets:precompile:nondigest", false) if Rails.application.config.assets.digest
end
task :primary => ["assets:environment", "tmp:cache:clear"] do

0 comments on commit a579d4b

Please sign in to comment.