summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters/cvs_adapter.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-22 08:05:51 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-22 08:05:51 +0000
commit11e4c5c1ea1f91d77ed14e08893b44001d0d1459 (patch)
tree342e7b7044f2d4d732df2c9e2474f2ec51553aa1 /lib/redmine/scm/adapters/cvs_adapter.rb
parent1236e037f229e406a681f0207ea3f5534133d6c4 (diff)
downloadredmine-11e4c5c1ea1f91d77ed14e08893b44001d0d1459.tar.gz
redmine-11e4c5c1ea1f91d77ed14e08893b44001d0d1459.zip
scm: Ruby 1.9 compatibility in getting scm version (#4273).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4920 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters/cvs_adapter.rb')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 6ce10e383..365d44041 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -44,6 +44,9 @@ module Redmine
def scm_command_version
scm_version = scm_version_from_command_line
+ if scm_version.respond_to?(:force_encoding)
+ scm_version.force_encoding('ASCII-8BIT')
+ end
if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)}m)
m[2].scan(%r{\d+}).collect(&:to_i)
end