Merged r4417 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4418 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang committed 2010-11-20 14:06:32 +00:00
1 parent dbb26b08f8
commit 6c362a5a76
2 files changed
+9 -8

No files matched your search

@@ -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