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

Fix dialyzer warnings in scm client vsn checks

Browse source
This commit is contained in:
Tuncer Ayaz 2010-09-29 23:09:04 +02:00
parent f8900aecc3
commit e33285aeaf
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/rebar_deps.erl
View file

@ -1,3 +1,4 @@
%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
%% ex: ts=4 sw=4 et %% ex: ts=4 sw=4 et
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
@ -196,9 +197,7 @@ delete_dep(D) ->
require_source_engine(Source) -> require_source_engine(Source) ->
case source_engine_avail(Source) of case source_engine_avail(Source) of
true -> true ->
ok; ok
false ->
?ABORT("No command line interface available to process ~p\n", [Source])
end. end.
@ -295,14 +294,14 @@ download_source(AppDir, {svn, Url, Rev}) ->
%% Source helper functions %% Source helper functions
%% =================================================================== %% ===================================================================
source_engine_avail({Name, _, _}) source_engine_avail({Name, _, _}=Source)
when Name == hg; Name == git; Name == svn; Name == bzr -> when Name == hg; Name == git; Name == svn; Name == bzr ->
case scm_client_vsn(Name) >= required_scm_client_vsn(Name) of case scm_client_vsn(Name) >= required_scm_client_vsn(Name) of
true -> true ->
true; true;
false -> false ->
?ABORT("Rebar requires version ~p or higher of ~s\n", ?ABORT("Rebar requires version ~p or higher of ~s to process ~p\n",
[required_scm_client_vsn(Name), Name]) [required_scm_client_vsn(Name), Name, Source])
end. end.
scm_client_vsn(false, _VsnArg, _VsnRegex) -> scm_client_vsn(false, _VsnArg, _VsnRegex) ->
@ -322,12 +321,10 @@ required_scm_client_vsn(bzr) -> {2, 0};
required_scm_client_vsn(svn) -> {1, 6}. required_scm_client_vsn(svn) -> {1, 6}.
scm_client_vsn(hg) -> scm_client_vsn(hg) ->
scm_client_vsn(rebar_utils:find_executable(hg), " --version", "version (\\d+).(\\d+)"); scm_client_vsn(rebar_utils:find_executable("hg"), " --version", "version (\\d+).(\\d+)");
scm_client_vsn(git) -> scm_client_vsn(git) ->
scm_client_vsn(rebar_utils:find_executable(git), " --version", "git version (\\d+).(\\d+)"); scm_client_vsn(rebar_utils:find_executable("git"), " --version", "git version (\\d+).(\\d+)");
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, version (\\d+).(\\d+)"); scm_client_vsn(rebar_utils:find_executable("svn"), " --version", "svn, version (\\d+).(\\d+)").
scm_client_vsn(_) ->
undefined.

6
src/rebar_utils.erl
View file

@ -140,7 +140,11 @@ escript_foldl(Fun, Acc, File) ->
end. end.
find_executable(Name) -> find_executable(Name) ->
"\"" ++ filename:nativename(os:find_executable(Name)) ++ "\"". case os:find_executable(Name) of
false -> false;
Path ->
"\"" ++ filename:nativename(Path) ++ "\""
end.
%% ==================================================================== %% ====================================================================
%% Internal functions %% Internal functions