summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuncer Ayaz <tuncer.ayaz@gmail.com>2010-10-02 22:58:25 +0200
committerTuncer Ayaz <tuncer.ayaz@gmail.com>2010-10-02 22:58:25 +0200
commit2f1d527ef17c8f87b518ea584650e1dc9d50d235 (patch)
treeae6607af3f9fc90d2d30c1956d45be89e6e8b2b6
parent73398562aa2096603a6587c5e590d8f84b32def6 (diff)
Fix bug 676
The previous fix to relax the regex was insufficient. This is basically the diff proposed by Bryan Fink with the difference of using 'C' instead of 'en_US'.
-rw-r--r--src/rebar_deps.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl
index 4c8dfed..a79e485 100644
--- a/src/rebar_deps.erl
+++ b/src/rebar_deps.erl
@@ -307,7 +307,7 @@ source_engine_avail({Name, _, _}=Source)
scm_client_vsn(false, _VsnArg, _VsnRegex) ->
false;
scm_client_vsn(Path, VsnArg, VsnRegex) ->
- Info = os:cmd(Path ++ VsnArg),
+ Info = os:cmd("LANG=C " ++ Path ++ VsnArg),
case re:run(Info, VsnRegex, [{capture, all_but_first, list}]) of
{match, Match} ->
list_to_tuple([list_to_integer(S) || S <- Match]);
@@ -327,4 +327,4 @@ scm_client_vsn(git) ->
scm_client_vsn(bzr) ->
scm_client_vsn(rebar_utils:find_executable("bzr"), " --version", "Bazaar \\(bzr\\) (\\d+).(\\d+)");
scm_client_vsn(svn) ->
- scm_client_vsn(rebar_utils:find_executable("svn"), " --version", "svn, \\w+ (\\d+).(\\d+)").
+ scm_client_vsn(rebar_utils:find_executable("svn"), " --version", "svn, version (\\d+).(\\d+)").