rebar_deps: 'depowner' has to be stored in xconf
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/95910c77 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/95910c77 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/95910c77 Branch: refs/heads/import Commit: 95910c776410dc99bc09c7ad40d94465f1ce1d62 Parents: 6518b5f Author: Tuncer Ayaz <[email protected]> Authored: Wed Oct 16 12:49:06 2013 +0200 Committer: Tuncer Ayaz <[email protected]> Committed: Wed Oct 16 12:51:22 2013 +0200 ---------------------------------------------------------------------- src/rebar_deps.erl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/95910c77/src/rebar_deps.erl ---------------------------------------------------------------------- diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl index 22ffa4f..442a782 100644 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@ -183,8 +183,9 @@ do_check_deps(Config) -> {ok, save_dep_dirs(Config2, lists:reverse(PulledDeps))}. 'update-deps'(Config, _) -> - {Config2, UpdatedDeps} = update_deps_int(rebar_config:set(Config, depowner, dict:new()), []), - DepOwners = rebar_config:get(Config2, depowner, dict:new()), + Config1 = rebar_config:set_xconf(Config, depowner, dict:new()), + {Config2, UpdatedDeps} = update_deps_int(Config1, []), + DepOwners = rebar_config:get_xconf(Config2, depowner, dict:new()), %% check for conflicting deps _ = [?ERROR("Conflicting dependencies for ~p: ~p~n", @@ -620,11 +621,12 @@ update_deps_int(Config0, UDD) -> ok = file:set_cwd(AppDir), Config3 = rebar_config:new(Config2), %% track where a dep comes from... - Config4 = rebar_config:set(Config3, depowner, - dict:append(Dep, ConfDir, - rebar_config:get(Config3, - depowner, - dict:new()))), + DepOwner = dict:append( + Dep, ConfDir, + rebar_config:get_xconf(Config3, depowner, + dict:new())), + Config4 = rebar_config:set_xconf(Config3, depowner, + DepOwner), {Config5, Res} = update_deps_int(Config4, Updated), {Config5, lists:umerge(lists:sort(Res),
