github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

rebar_deps: 'depowner' has to be stored in xconf

Browse source
This commit is contained in:
Tuncer Ayaz 2013-10-16 12:49:06 +02:00
parent 6518b5f541
commit 95910c7764
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/rebar_deps.erl
View file

@ -183,8 +183,9 @@ do_check_deps(Config) ->
{ok, save_dep_dirs(Config2, lists:reverse(PulledDeps))}. {ok, save_dep_dirs(Config2, lists:reverse(PulledDeps))}.
'update-deps'(Config, _) -> 'update-deps'(Config, _) ->
{Config2, UpdatedDeps} = update_deps_int(rebar_config:set(Config, depowner, dict:new()), []), Config1 = rebar_config:set_xconf(Config, depowner, dict:new()),
DepOwners = rebar_config:get(Config2, depowner, dict:new()), {Config2, UpdatedDeps} = update_deps_int(Config1, []),
DepOwners = rebar_config:get_xconf(Config2, depowner, dict:new()),
%% check for conflicting deps %% check for conflicting deps
_ = [?ERROR("Conflicting dependencies for ~p: ~p~n", _ = [?ERROR("Conflicting dependencies for ~p: ~p~n",
@ -620,11 +621,12 @@ update_deps_int(Config0, UDD) ->
ok = file:set_cwd(AppDir), ok = file:set_cwd(AppDir),
Config3 = rebar_config:new(Config2), Config3 = rebar_config:new(Config2),
%% track where a dep comes from... %% track where a dep comes from...
Config4 = rebar_config:set(Config3, depowner, DepOwner = dict:append(
dict:append(Dep, ConfDir, Dep, ConfDir,
rebar_config:get(Config3, rebar_config:get_xconf(Config3, depowner,
depowner, dict:new())),
dict:new()))), Config4 = rebar_config:set_xconf(Config3, depowner,
DepOwner),
{Config5, Res} = update_deps_int(Config4, Updated), {Config5, Res} = update_deps_int(Config4, Updated),
{Config5, lists:umerge(lists:sort(Res), {Config5, lists:umerge(lists:sort(Res),