[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/2.3.0+dfsg1-5-7-ged4ea81

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit dbe5f8c5c9500568d88dba15edd7e1a90f0ea19e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Mar 27 12:26:24 2013 +0100

    Finish replacing RAILS_CACHE with RAILS_TMP (Closes: #704039)

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index f4f363d..f161caa 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -13,7 +13,7 @@ Last-Update: 2012-01-19
  
    cattr_accessor :thumbnails_storage_path
 -  @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
-+  @@thumbnails_storage_path = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails")
++  @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails")
  
    before_save :files_to_final_location
    after_destroy :delete_from_disk
@@ -44,7 +44,7 @@ Last-Update: 2012-01-19
  
          def initialize(lang, orientation='P')
 -          @@k_path_cache = Rails.root.join('tmp', 'pdf')
-+          @@k_path_cache = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], 'pdf') : Rails.root.join('tmp', 'pdf')
++          @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf')
            FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
            set_language_if_valid lang
            pdf_encoding = l(:general_pdf_encoding).upcase
@@ -95,11 +95,11 @@ Last-Update: 2012-01-19
    
    cattr_accessor :k_path_cache
 -  @@k_path_cache = Rails.root.join('tmp')
-+  @@k_path_cache = ENV['RAILS_CACHE'] ? ENV['RAILS_CACHE'] : Rails.root.join('tmp')
++  @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
    
    cattr_accessor :k_path_url_cache
 -  @@k_path_url_cache = Rails.root.join('tmp')
-+  @@k_path_url_cache = ENV['RAILS_CACHE'] ? ENV['RAILS_CACHE'] : Rails.root.join('tmp')
++  @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
    
  	attr_accessor :barcode
  	
diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
index 024162a..275ee5c 100644
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ b/debian/patches/2004_FHS_plugins_assets.patch
@@ -5,7 +5,7 @@
  
      cattr_accessor :public_directory
 -    self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
-+    self.public_directory = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets')
++    self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets')
  
      @registered_plugins = {}
      class << self

-- 
redmine.git