diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-24 04:03:16 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-24 04:03:16 +0000 |
| commit | e51aeb5a40fb966e34d47154f63c60722091094e (patch) | |
| tree | 481b6e7626a9fe6b3c67fcdafbc32baf6ee11fbe | |
| parent | f27637b07c4f148ff732f4dfffa7ec3e95c85e27 (diff) | |
| download | redmine-e51aeb5a40fb966e34d47154f63c60722091094e.tar.gz redmine-e51aeb5a40fb966e34d47154f63c60722091094e.zip | |
scm: use "ASCII-8BIT" in IO.popen() in Ruby 1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4938 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/scm/adapters/abstract_adapter.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index b0c93bd2c..2bd82f5bc 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -200,7 +200,12 @@ module Redmine cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log" end begin - IO.popen(cmd, "r+") do |io| + if RUBY_VERSION < '1.9' + mode = "r+" + else + mode = "r+:ASCII-8BIT" + end + IO.popen(cmd, mode) do |io| io.close_write block.call(io) if block_given? end |