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

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 7bb5ad91a76c87580679cbb0ee4830053303a6c3
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Mar 22 11:35:37 2013 +0100

    Import upstream fix to log SCM stderr when log level is set to debug only.

diff --git a/debian/patches/changeset_r11680.diff b/debian/patches/changeset_r11680.diff
new file mode 100644
index 0000000..b03833d
--- /dev/null
+++ b/debian/patches/changeset_r11680.diff
@@ -0,0 +1,14 @@
+--- 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 5cb94da..ca60d5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 2009_FHS_thin_config.patch
 2017_Gemfile_debian.patch
 2018_get_rid_of_rdoctask.patch
+changeset_r11680.diff

-- 
redmine.git