github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-12-18 03:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug 676

Browse source 
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'.
This commit is contained in:
Tuncer Ayaz 2010-10-02 22:58:25 +02:00
parent 73398562aa
commit 2f1d527ef1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rebar_deps.erl
View file

@ -307,7 +307,7 @@ source_engine_avail({Name, _, _}=Source)
scm_client_vsn(false, _VsnArg, _VsnRegex) -> scm_client_vsn(false, _VsnArg, _VsnRegex) ->
false; false;
scm_client_vsn(Path, VsnArg, VsnRegex) -> 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 case re:run(Info, VsnRegex, [{capture, all_but_first, list}]) of
{match, Match} -> {match, Match} ->
list_to_tuple([list_to_integer(S) || S <- 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(bzr) ->
scm_client_vsn(rebar_utils:find_executable("bzr"), " --version", "Bazaar \\(bzr\\) (\\d+).(\\d+)"); scm_client_vsn(rebar_utils:find_executable("bzr"), " --version", "Bazaar \\(bzr\\) (\\d+).(\\d+)");
scm_client_vsn(svn) -> 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+)").