[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-93-gbf76368

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit bfe2144b36d51935ec205b3827e56f89c92aebc9
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Mar 21 12:59:28 2013 +0100

    Put scm.stderr.log into correct directory

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 7f7f6a9..1ebfa80 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -101,3 +101,14 @@ Last-Update: 2012-01-19
    
  	attr_accessor :barcode
  	
+--- 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)

-- 
redmine.git