From 182b3ed70c81ae9450ee8ba7d8939510a19853fe Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 7 Mar 2007 00:48:28 +0000 Subject: Backed out of using File.atomic_write in the asset_tag_helper.rb as its still half-baked. Most importantly, it creates files with different permissions than File.open/write git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6354 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_view/helpers') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 6905aaf06e..8b9e4094ce 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -147,7 +147,7 @@ module ActionView joined_javascript_path = File.join(JAVASCRIPTS_DIR, joined_javascript_name) if !File.exists?(joined_javascript_path) - File.atomic_write(joined_javascript_path, File.dirname(joined_javascript_path)) do |cache| + File.open(joined_javascript_path, "w+") do |cache| javascript_paths = expand_javascript_sources(sources).collect do |source| compute_public_path(source, 'javascripts', 'js', false) end @@ -242,9 +242,9 @@ module ActionView joined_stylesheet_path = File.join(STYLESHEETS_DIR, joined_stylesheet_name) if !File.exists?(joined_stylesheet_path) - File.atomic_write(joined_stylesheet_path, File.dirname(joined_stylesheet_path)) do |cache| + File.open(joined_stylesheet_path, "w+") do |cache| stylesheet_paths = expand_stylesheet_sources(sources).collect do |source| - compute_public_path(source, 'stylesheets', 'css', false) + compute_public_path(source, 'stylesheets', 'css', false) end cache.write(join_asset_file_contents(stylesheet_paths)) -- cgit v1.2.3