From 6b72c6689305c13a728a311257b58b8465ee4353 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Nov 2010 14:04:22 +0000 Subject: Fixed: MercurialAdapter.client_version depends on LANG environment variable (#5117). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4417 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 9d5e9aa11..c1be57529 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -38,13 +38,13 @@ module Redmine # release number (eg 0.9.5 or 1.0) or as a revision # id composed of 12 hexa characters. theversion = hgversion_from_command_line - if theversion.match(/^\d+(\.\d+)+/) - theversion.split(".").collect(&:to_i) + if m = theversion.match(/\b\d+(\.\d+)+\b/) + m[0].split(".").collect(&:to_i) end end def hgversion_from_command_line - %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1] + %x{#{HG_BIN} --version}.lines.first.to_s end def template_path -- cgit v1.2.3