External deps_dir should have higher priority than the config one

The external deps_dir should have higher priority because
it is used by scripts and other build tools to set up the
location of the dependencies. This commit ensures that,
even if a project has set deps_dir in its config file has
lower preference than the command line one.
This commit is contained in:
José Valim 2013-06-18 00:28:52 +03:00
parent 16eed82ae4
commit e467642476

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.