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

Merge pull request #100 from josevalim/patch-1

Browse source 
External deps_dir should have higher priority than the config one
This commit is contained in:
Dave Smith 2013-06-17 15:05:10 -07:00
commit 3a9559651c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rebar_deps.erl
View file

@ -241,10 +241,11 @@ info_help(Description) ->
%% Added because of trans deps, %% Added because of trans deps,
%% need all deps in same dir and should be the one set by the root rebar.config %% need all deps in same dir and should be the one set by the root rebar.config
%% In case one is given globally, it has higher priority
%% Sets a default if root config has no deps_dir set %% Sets a default if root config has no deps_dir set
set_shared_deps_dir(Config, []) -> set_shared_deps_dir(Config, []) ->
GlobalDepsDir = rebar_config:get_global(Config, deps_dir, "deps"), LocalDepsDir = rebar_config:get_local(Config, deps_dir, "deps"),
DepsDir = rebar_config:get_local(Config, deps_dir, GlobalDepsDir), DepsDir = rebar_config:get_global(Config, deps_dir, LocalDepsDir),
rebar_config:set_xconf(Config, deps_dir, DepsDir); rebar_config:set_xconf(Config, deps_dir, DepsDir);
set_shared_deps_dir(Config, _DepsDir) -> set_shared_deps_dir(Config, _DepsDir) ->
Config. Config.