[DRE-commits] [redmine] 02/03: Remove stderr patch, merged upstream

[Ondrej Sury]

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

ondrej pushed a commit to annotated tag debian/2.3.1-1
in repository redmine.

commit 42c71061314dcbd110060955df079ab94af194c8
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu May 23 18:46:00 2013 +0200

    Remove stderr patch, merged upstream
---
 debian/patches/2002_FHS_through_env_vars.patch | 18 +++++++++---------
 debian/patches/changeset_r11680.diff           | 14 --------------
 debian/patches/series                          |  1 -
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index f161caa..ecc6026 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -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 @@ module Redmine
+           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
diff --git a/debian/patches/changeset_r11680.diff b/debian/patches/changeset_r11680.diff
deleted file mode 100644
index b03833d..0000000
--- a/debian/patches/changeset_r11680.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/redmine/scm/adapters/abstract_adapter.rb
-+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -228,9 +228,9 @@ module Redmine
-         def self.shellout(cmd, options = {}, &block)
-           if logger && logger.debug?
-             logger.debug "Shelling out: #{strip_credential(cmd)}"
-+            # Capture stderr in a log file
-+            cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
-           end
--          # Capture stderr in a log file
--          cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
-           begin
-             mode = "r+"
-             IO.popen(cmd, mode) do |io|
diff --git a/debian/patches/series b/debian/patches/series
index ca60d5b..5cb94da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 2009_FHS_thin_config.patch
 2017_Gemfile_debian.patch
 2018_get_rid_of_rdoctask.patch
-changeset_r11680.diff

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