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

Check for VCS directory before attempting source update.

Browse source
This commit is contained in:
Dave Smith 2010-12-07 10:37:29 -07:00
parent 2ff81e5058
commit 3e12630f23
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rebar_deps.erl
View file

@ -297,11 +297,21 @@ download_source(AppDir, {svn, Url, Rev}) ->
filename:dirname(AppDir)). filename:dirname(AppDir)).
update_source(Dep) -> update_source(Dep) ->
%% It's possible when updating a source, that a given dep does not have a
%% VCS directory, such as when a source archive is built of a project, with
%% all deps already downloaded/included. So, verify that the necessary VCS
%% directory exists before attempting to do the update.
AppDir = filename:join(get_deps_dir(), Dep#dep.app),
case has_vcs_dir(element(1, Dep#dep.source), AppDir) of
true ->
?CONSOLE("Updating ~p from ~p\n", [Dep#dep.app, Dep#dep.source]), ?CONSOLE("Updating ~p from ~p\n", [Dep#dep.app, Dep#dep.source]),
require_source_engine(Dep#dep.source), require_source_engine(Dep#dep.source),
update_source(filename:join(get_deps_dir(), Dep#dep.app), update_source(AppDir, Dep#dep.source),
Dep#dep.source), Dep;
Dep. false ->
?WARN("Skipping update for ~p: no VCS directory available!\n", [Dep]),
Dep
end.
update_source(AppDir, {git, _Url, {branch, Branch}}) -> update_source(AppDir, {git, _Url, {branch, Branch}}) ->
rebar_utils:sh(?FMT("git fetch origin", []), [], AppDir), rebar_utils:sh(?FMT("git fetch origin", []), [], AppDir),
@ -358,3 +368,10 @@ 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+)").
has_vcs_dir(git, Dir) ->
filelib:is_dir(filename:join(Dir, ".git"));
has_vcs_dir(hg, Dir) ->
filelib:is_dir(filename:join(Dir, ".hg"));
has_vcs_dir(_, _) ->
true.