diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-03-28 10:54:38 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-03-28 10:54:38 +0000 |
| commit | 2145b650a66a5507d2582974a34b98bb84850b0c (patch) | |
| tree | 30b82ee8094f885445730bc4f543189b281d8937 /lib/redmine/scm | |
| parent | 5f37d0d1c8064f1ec4fa078d752b9aca48ce265b (diff) | |
| download | redmine-2145b650a66a5507d2582974a34b98bb84850b0c.tar.gz redmine-2145b650a66a5507d2582974a34b98bb84850b0c.zip | |
Ruby1.9: scm: use :set_encoding instead of "RUBY_VERSION < '1.9'" for IO.popen (#10470)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9280 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm')
| -rw-r--r-- | lib/redmine/scm/adapters/abstract_adapter.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index bb46a4865..3797534c3 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -223,12 +223,9 @@ module Redmine cmd = "#{cmd} 2>>#{shell_quote(Rails.root.join('log/scm.stderr.log').to_s)}" end begin - if RUBY_VERSION < '1.9' - mode = "r+" - else - mode = "r+:ASCII-8BIT" - end + mode = "r+" IO.popen(cmd, mode) do |io| + io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding) io.close_write block.call(io) if block_given? end |