diff options
| author | Sam Stephenson <sam@37signals.com> | 2006-03-12 17:04:33 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2006-03-12 17:04:33 +0000 |
| commit | e3ea34f7d30b9866da8f34be4108f8449218f9fd (patch) | |
| tree | 2e64c8a9793207d181e8c661c1f7a2f386b4b48e | |
| parent | de37f7df4f6bfe369598b2f92b07ce9c2c212e76 (diff) | |
| download | rails-e3ea34f7d30b9866da8f34be4108f8449218f9fd.tar.gz rails-e3ea34f7d30b9866da8f34be4108f8449218f9fd.tar.bz2 rails-e3ea34f7d30b9866da8f34be4108f8449218f9fd.zip | |
Use the Rake API instead of shelling out to create the tmp directory in commands/server.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3848 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/server.rb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 26a9057cf5..fdab43a159 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use the Rake API instead of shelling out to create the tmp directory in commands/server.rb. [Chad Fowler] + * Added a backtrace to the evil WSOD (White Screen of Death). Closes #4073. TODO: Clearer exceptions [Rick Olson] * Added tracking of database and framework versions in script/about #4088 [charles.gerungan@gmail.com/Rick Olson] diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index 85e3a64d60..d91a395b81 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -25,5 +25,10 @@ else puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)" end -silence_stderr { `rake tmp:create` } -require "commands/servers/#{server}"
\ No newline at end of file +require 'rake' +load File.join(File.dirname(__FILE__), "..", "tasks", "tmp.rake") +begin + Rake::Task['tmp:create'].execute +rescue Errno::EEXIST => e +end +require "commands/servers/#{server}" |