[DRE-commits] [redmine] 01/17: Refresh 2002 patch

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master-experimental
in repository redmine.

commit e1ad41fdde085858efe9a722208e59a760a2068a
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Sep 28 00:29:18 2013 +0200

    Refresh 2002 patch
---
 debian/patches/2002_FHS_through_env_vars.patch |   34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index f161caa..28a84c6 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -1,10 +1,10 @@
 Description: FHS through env vars
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2012-01-19
+Last-Update: 2013-09-28
 --- a/app/models/attachment.rb
 +++ b/app/models/attachment.rb
-@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base
+@@ -46,10 +46,10 @@
                                                          "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
  
    cattr_accessor :storage_path
@@ -19,7 +19,7 @@ Last-Update: 2012-01-19
    after_destroy :delete_from_disk
 --- a/lib/redmine/configuration.rb
 +++ b/lib/redmine/configuration.rb
-@@ -32,7 +32,7 @@ module Redmine
+@@ -32,7 +32,7 @@
        # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml)
        # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env)
        def load(options={})
@@ -28,7 +28,7 @@ Last-Update: 2012-01-19
          env = options[:env] || Rails.env
  
          @config = @defaults.dup
-@@ -103,7 +103,7 @@ module Redmine
+@@ -103,7 +103,7 @@
        end
  
        def load_deprecated_email_configuration(env)
@@ -39,7 +39,7 @@ Last-Update: 2012-01-19
            @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
 --- a/lib/redmine/export/pdf.rb
 +++ b/lib/redmine/export/pdf.rb
-@@ -38,7 +38,7 @@ module Redmine
+@@ -38,7 +38,7 @@
          attr_accessor :footer_date
  
          def initialize(lang, orientation='P')
@@ -50,7 +50,7 @@ Last-Update: 2012-01-19
            pdf_encoding = l(:general_pdf_encoding).upcase
 --- a/config/application.rb
 +++ b/config/application.rb
-@@ -2,6 +2,17 @@ require File.expand_path('../boot', __FI
+@@ -2,6 +2,17 @@
  
  require 'rails/all'
  
@@ -68,7 +68,7 @@ Last-Update: 2012-01-19
  if defined?(Bundler)
    # If you precompile assets before deploying to production, use this line
    Bundler.require(*Rails.groups(:assets => %w(development test)))
-@@ -53,8 +64,19 @@ module RedmineApp
+@@ -53,8 +64,19 @@
      # Do not include all helpers
      config.action_controller.include_all_helpers = false
  
@@ -90,7 +90,7 @@ Last-Update: 2012-01-19
      end
 --- a/lib/plugins/rfpdf/lib/tcpdf.rb
 +++ b/lib/plugins/rfpdf/lib/tcpdf.rb
-@@ -89,10 +89,10 @@ class TCPDF
+@@ -89,10 +89,10 @@
    @@k_small_ratio = 2/3.0
    
    cattr_accessor :k_path_cache
@@ -105,12 +105,12 @@ Last-Update: 2012-01-19
  	
 --- a/lib/redmine/scm/adapters/abstract_adapter.rb
 +++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -222,7 +222,7 @@ module Redmine
-         def self.stderr_log_file
-           @stderr_log_path ||=
-             Redmine::Configuration['scm_stderr_log_file'].presence ||
--            Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
-+            ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
-         end
- 
-         def self.shellout(cmd, options = {}, &block)
+@@ -224,7 +224,7 @@
+           if @stderr_log_file.nil?
+             writable = false
+             path = Redmine::Configuration['scm_stderr_log_file'].presence
+-            path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
++            path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
+             if File.exists?(path)
+               if File.file?(path) && File.writable?(path) 
+                 writable = true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git